aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-02-25 14:15:13 +0000
committerMario <mario@mariovavti.com>2021-02-25 14:15:13 +0000
commitc1afa306c9b84eafd95a587c9a87ef141c0c3f08 (patch)
treef519602ddb05c5b0bd3105cfd1bf6e52c90b10fc /include
parent65a20a780d4a21aeddaf924d51090b650be96595 (diff)
downloadvolse-hubzilla-c1afa306c9b84eafd95a587c9a87ef141c0c3f08.tar.gz
volse-hubzilla-c1afa306c9b84eafd95a587c9a87ef141c0c3f08.tar.bz2
volse-hubzilla-c1afa306c9b84eafd95a587c9a87ef141c0c3f08.zip
fix logic
Diffstat (limited to 'include')
-rw-r--r--include/nav.php9
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'),