harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go through the entire discovery sequence for mentions to make sure we have the correct URL

Browse Source
This commit is contained in:
friendica 2014-09-09 22:33:23 -07:00
parent c1713d49e0
commit e7b005b1f8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/bb2diaspora.php
View File

@ -85,13 +85,21 @@ function diaspora_mention_callback($matches) {
$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
dbesc($webbie) dbesc($webbie)
); );
if(! $r) {
$x = discover_by_webbie($webbie);
if($x) {
$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
dbesc($webbie)
);
}
}
if($r) if($r)
$link = $r[0]['xchan_url']; $link = $r[0]['xchan_url'];
} }
if(! $link) if(! $link)
$link = 'https://' . $matches[3] . '/u/' . $matches[2]; $link = 'https://' . $matches[3] . '/u/' . $matches[2];
return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($mentions[0],-1,1) === '+') ? '+' : '') . '[/url]' ; return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ;
} }