clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9048 from annando/fix-tag-scheme 

Fix malformatted tag scheme
This commit is contained in:
Tobias Diekershoff 2020-08-22 13:21:54 +02:00 committed by GitHub
parent 101daab790 22027f8451
commit 2475058cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Tag.php
View File

@ -93,6 +93,10 @@ class Tag
return; return;
} }
if ((substr($url, 0, 7) == 'https//') || (substr($url, 0, 6) == 'http//')) {
Logger::notice('Wrong scheme in url', ['url' => $url, 'callstack' => System::callstack(20)]);
}
if (!$probing) { if (!$probing) {
$condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false]; $condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false];
$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]); $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);

2
src/Protocol/DFRN.php
View File

@ -2408,7 +2408,7 @@ class DFRN
$parts = explode(":", $scheme); $parts = explode(":", $scheme);
if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) { if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
$termurl = array_pop($parts); $termurl = array_pop($parts);
$termurl = array_pop($parts) . $termurl; $termurl = array_pop($parts) . ':' . $termurl;
Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl); Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
} }
} }