aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-09 23:12:17 -0700
committerfriendica <info@friendica.com>2014-09-09 23:12:17 -0700
commitf09b7ca40936b8f2891d3dc0317968111eb34fb1 (patch)
tree1e18b82bea3b85265dd053334884a6124924ea5f /include
parentcb10da3eef0fcf5e9f64f002932f9879de3310dc (diff)
downloadvolse-hubzilla-f09b7ca40936b8f2891d3dc0317968111eb34fb1.tar.gz
volse-hubzilla-f09b7ca40936b8f2891d3dc0317968111eb34fb1.tar.bz2
volse-hubzilla-f09b7ca40936b8f2891d3dc0317968111eb34fb1.zip
cross-network mention issues
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index c499a046a..d3be22225 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -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,7 +99,10 @@ function diaspora_mention_callback($matches) {
if(! $link)
$link = 'https://' . $matches[3] . '/u/' . $matches[2];
- return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ;
+ 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]' ;
}