diff options
| author | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
| commit | 9359fc065c72243bd85f0fc3db842976f07183cc (patch) | |
| tree | 37551feefe6fff472b9c346a7a8c3cd9080d8946 /include/nav.php | |
| parent | 878be8fff0328ee4ab978de20e7e385244ac54ec (diff) | |
| parent | 19daadbfd7f281e27dffdc53d0e8ebeb837e1ae3 (diff) | |
| download | volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.gz volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.bz2 volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/nav.php b/include/nav.php index 1ad8dad58..994f7e0c0 100644 --- a/include/nav.php +++ b/include/nav.php @@ -295,11 +295,10 @@ function nav($template = 'default') { foreach ($syslist as $app) { if (isset(App::$nav_sel['name']) && App::$nav_sel['name'] == $app['name']) $app['active'] = true; - if ($is_owner) { $nav_apps[] = Apps::app_render($app, 'nav'); } - elseif (!$is_owner && isset($app['requires']) && strpos($app['requires'], 'local_channel') === false) { + elseif (!$is_owner && (!isset($app['requires']) || (isset($app['requires']) && strpos($app['requires'], 'local_channel') === false))) { $nav_apps[] = Apps::app_render($app, 'nav'); } } @@ -400,9 +399,9 @@ function channel_apps($is_owner = false, $nickname = null) { $sql_options = item_permissions_sql($uid); $r = q("select item.* from item left join iconfig on item.id = iconfig.iid - where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' - and item.item_delayed = 0 and item.item_deleted = 0 - and ( iconfig.k = 'WEBPAGE' and item_type = %d ) + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' + and item.item_delayed = 0 and item.item_deleted = 0 + and ( iconfig.k = 'WEBPAGE' and item_type = %d ) $sql_options limit 1", intval($uid), dbesc('home'), |