diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-07 08:39:29 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-07 08:39:29 +0200 |
| commit | 5acd166d185a62969276df9a84b3c2bfcb8f96cb (patch) | |
| tree | ac03b71dec7228911262b1ae2a0e2fddd83f2488 | |
| parent | 3efeeecaceca094cd46d8e262a4f9c0f461284ba (diff) | |
| parent | 52be5c1660abb1f3f8c6a8f0ba09799615214c30 (diff) | |
| download | volse-hubzilla-5acd166d185a62969276df9a84b3c2bfcb8f96cb.tar.gz volse-hubzilla-5acd166d185a62969276df9a84b3c2bfcb8f96cb.tar.bz2 volse-hubzilla-5acd166d185a62969276df9a84b3c2bfcb8f96cb.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 10 | ||||
| -rw-r--r-- | include/import.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 5117816bf..e6757497a 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': @@ -532,8 +532,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), @@ -982,7 +982,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]; } @@ -1068,7 +1068,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]; } diff --git a/include/import.php b/include/import.php index 0fc24a26f..714161c57 100644 --- a/include/import.php +++ b/include/import.php @@ -234,7 +234,7 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) { if(($x = zot_gethub($arr,false)) === false) { unset($hubloc['hubloc_id']); - create_table_from_array('hubloc', $hubloc); + hubloc_store_lowlevel($hubloc); } else { q("UPDATE hubloc set hubloc_primary = %d, hubloc_deleted = %d where hubloc_id = %d", |