diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-05 23:27:50 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-07 08:43:03 +0200 |
| commit | 78c6f40093cb803019ae9565094f1d7a19d3ff18 (patch) | |
| tree | 08c93c355e5a416692c2edd2cadf895fbb48a965 /Zotlabs | |
| parent | f85cce714f91c877a86a57d95943d1ff7a22b31c (diff) | |
| download | volse-hubzilla-78c6f40093cb803019ae9565094f1d7a19d3ff18.tar.gz volse-hubzilla-78c6f40093cb803019ae9565094f1d7a19d3ff18.tar.bz2 volse-hubzilla-78c6f40093cb803019ae9565094f1d7a19d3ff18.zip | |
minor app cleanup
(cherry picked from commit 835e222af0df627a262ab55e940f9d3808b6e000)
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index b40cf70e5..49863edca 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -269,7 +269,7 @@ class Apps { unset($ret); break; case 'custom_role': - if(get_pconfig(local_channel(),'system','permissions_role') != 'custom') + if(get_pconfig(local_channel(),'system','permissions_role') !== 'custom') unset($ret); break; case 'observer': @@ -531,8 +531,8 @@ class Apps { '$installed' => $installed, '$action_label' => (($hosturl && in_array($mode, ['view','install'])) ? $install_action : ''), '$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''), - '$delete' => ((local_channel() && $mode == 'edit') ? t('Delete') : ''), - '$undelete' => ((local_channel() && $mode == 'edit') ? t('Undelete') : ''), + '$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''), + '$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''), '$settings_url' => ((local_channel() && $installed && $mode == 'list') ? $papp['settings_url'] : ''), '$deleted' => $papp['deleted'], '$feature' => (($papp['embed'] || $mode == 'edit') ? false : true), @@ -981,7 +981,7 @@ class Apps { $arr['author'] = $sys['channel_hash']; } - if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (! strpos($arr['photo'],z_root()))) { + if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (strpos($arr['photo'],z_root()) !== false)) { $x = import_xchan_photo(str_replace('$baseurl',z_root(),$arr['photo']),get_observer_hash(),true); $arr['photo'] = $x[1]; } @@ -1067,7 +1067,7 @@ class Apps { if((! $darray['app_url']) || (! $darray['app_id'])) return $ret; - if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (! strpos($arr['photo'],z_root()))) { + if($arr['photo'] && (strpos($arr['photo'],'icon:') === false) && (strpos($arr['photo'],z_root()) !== false)) { $x = import_xchan_photo(str_replace('$baseurl',z_root(),$arr['photo']),get_observer_hash(),true); $arr['photo'] = $x[1]; } |