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

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.

Browse Source
This commit is contained in:
zotlabs 2017-02-06 14:10:54 -08:00
parent 00cfc4be44
commit 947478ca76
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Lib/Apps.php
View File

@ -146,9 +146,12 @@ class Apps {
$ret['type'] = 'system'; $ret['type'] = 'system';
foreach($ret as $k => $v) { foreach($ret as $k => $v) {
if(strpos($v,'http') === 0) if(strpos($v,'http') === 0) {
if(! (local_channel() && strpos($v,z_root()) === 0)) {
$ret[$k] = zid($v); $ret[$k] = zid($v);
} }
}
}
if(array_key_exists('desc',$ret)) if(array_key_exists('desc',$ret))
$ret['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['desc']); $ret['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['desc']);
@ -280,8 +283,11 @@ class Apps {
$papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url']; $papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url'];
foreach($papp as $k => $v) { foreach($papp as $k => $v) {
if(strpos($v,'http') === 0 && $k != 'papp') if(strpos($v,'http') === 0 && $k != 'papp') {
if(! (local_channel() && strpos($v,z_root()) === 0)) {
$papp[$k] = zid($v); $papp[$k] = zid($v);
}
}
if($k === 'desc') if($k === 'desc')
$papp['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$papp['desc']); $papp['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$papp['desc']);