aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-06 14:10:54 -0800
committerzotlabs <mike@macgirvin.com>2017-02-06 14:10:54 -0800
commit947478ca760d8a59753d9139592ea623a49a3f08 (patch)
treebdf432703174cb155e725b52bb180e6a04a14cc1 /Zotlabs
parent00cfc4be44fdb5c3d6d9a7f78d4a1726708bdc6e (diff)
downloadvolse-hubzilla-947478ca760d8a59753d9139592ea623a49a3f08.tar.gz
volse-hubzilla-947478ca760d8a59753d9139592ea623a49a3f08.tar.bz2
volse-hubzilla-947478ca760d8a59753d9139592ea623a49a3f08.zip
don't add zid to app links if they're on this system and we're logged in already. This messes up the null arg detection in mod_network.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index e40c7ef0e..ee1458aba 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -146,8 +146,11 @@ class Apps {
$ret['type'] = 'system';
foreach($ret as $k => $v) {
- if(strpos($v,'http') === 0)
- $ret[$k] = zid($v);
+ if(strpos($v,'http') === 0) {
+ if(! (local_channel() && strpos($v,z_root()) === 0)) {
+ $ret[$k] = zid($v);
+ }
+ }
}
if(array_key_exists('desc',$ret))
@@ -280,8 +283,11 @@ class Apps {
$papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url'];
foreach($papp as $k => $v) {
- if(strpos($v,'http') === 0 && $k != 'papp')
- $papp[$k] = zid($v);
+ if(strpos($v,'http') === 0 && $k != 'papp') {
+ if(! (local_channel() && strpos($v,z_root()) === 0)) {
+ $papp[$k] = zid($v);
+ }
+ }
if($k === 'desc')
$papp['desc'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$papp['desc']);