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

cross-network mention issues

Browse Source
This commit is contained in:
friendica 2014-09-09 23:12:17 -07:00
parent cb10da3eef
commit f09b7ca409
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/bb2diaspora.php
View File

@ -79,7 +79,7 @@ function share_unshield($m) {
function diaspora_mention_callback($matches) {
$webbie = $matches[2];
$webbie = $matches[2] . '@' . $matches[3];
$link = '';
if($webbie) {
$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
@ -99,6 +99,9 @@ function diaspora_mention_callback($matches) {
if(! $link)
$link = 'https://' . $matches[3] . '/u/' . $matches[2];
if($r && $r[0]['hubloc_network'] === 'zot')
return '@[zrl=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/zrl]' ;
else
return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ;
}