diff options
author | Mario <mario@mariovavti.com> | 2020-06-11 12:13:44 +0200 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2020-06-11 12:13:44 +0200 |
commit | c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f (patch) | |
tree | 255dc1dbe5745a2bf9b5a4f93ed82628052067cb /include/nav.php | |
parent | 9da8e30c378a58a89d3eeaf2f29d8c8774128235 (diff) | |
parent | 3201a4bec5f3524c2eba813e46d69b4c5943840f (diff) | |
download | volse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.tar.gz volse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.tar.bz2 volse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.zip |
Merge branch 'dev' into 'dev'
allow apps to be both pinned and starred independently
See merge request hubzilla/core!1858
Diffstat (limited to 'include/nav.php')
-rw-r--r-- | include/nav.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/nav.php b/include/nav.php index bd4d000f7..b2a061661 100644 --- a/include/nav.php +++ b/include/nav.php @@ -296,14 +296,10 @@ function nav($template = 'default') { $app['active'] = true; if($is_owner) { - if(strpos($app['categories'],'nav_pinned_app') === false) { - $nav_apps[] = Apps::app_render($app,'nav'); - } + $nav_apps[] = Apps::app_render($app,'nav'); } elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) { - if(strpos($app['categories'],'nav_pinned_app') === false) { - $nav_apps[] = Apps::app_render($app,'nav'); - } + $nav_apps[] = Apps::app_render($app,'nav'); } } } |