aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-04-18 19:11:28 -0700
committerfriendica <info@friendica.com>2013-04-18 19:11:28 -0700
commit2679a5990e8551d8d63ef561d762ca16dde520c4 (patch)
tree7581a232680fbc20392510ec233ef0abd6eff6de
parentdb038c56542f7fb9658c3b7a703e50efe7823014 (diff)
downloadvolse-hubzilla-2679a5990e8551d8d63ef561d762ca16dde520c4.tar.gz
volse-hubzilla-2679a5990e8551d8d63ef561d762ca16dde520c4.tar.bz2
volse-hubzilla-2679a5990e8551d8d63ef561d762ca16dde520c4.zip
small issue with zid returning incorrect result on your own channel link
-rw-r--r--boot.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/boot.php b/boot.php
index 8e6b85905..33d9a2ee9 100644
--- a/boot.php
+++ b/boot.php
@@ -2067,8 +2067,11 @@ function zid($s,$force = false) {
$mine = get_my_url();
$myaddr = get_my_address();
+
if($mine and ! link_compare($mine,$s))
$zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
+ else
+ $zurl = $s;
$arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl);
call_hooks('zid', $arr);