diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-19 17:39:42 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-19 17:39:42 -0800 |
| commit | 6a49e3124e193edf57005873e825bf8328649183 (patch) | |
| tree | 138c2387b7d107575f89a3de9ad3c35ae2ce60c6 /include/nav.php | |
| parent | 16f584608f8147a58bfe295ff3295aae0f85b38a (diff) | |
| parent | 88d0bf94d89ac739469528bdab7905d0c00cf8a9 (diff) | |
| download | volse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.tar.gz volse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.tar.bz2 volse-hubzilla-6a49e3124e193edf57005873e825bf8328649183.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/nav.php b/include/nav.php index 9df50c9fe..2dcf68bc8 100644 --- a/include/nav.php +++ b/include/nav.php @@ -253,7 +253,7 @@ EOT; } $syslist = array(); - $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app'); + $list = Zlib\Apps::app_list(local_channel(), false, ['nav_featured_app', 'nav_pinned_app']); if($list) { foreach($list as $li) { $syslist[] = Zlib\Apps::app_encode($li); @@ -274,16 +274,20 @@ EOT; $app['active'] = true; if($is_owner) { - $nav_apps[] = Zlib\Apps::app_render($app,'nav'); - if(strpos($app['categories'],'navbar_' . $template)) { + if(strpos($app['categories'],'nav_pinned_app') !== false) { $navbar_apps[] = Zlib\Apps::app_render($app,'navbar'); } + else { + $nav_apps[] = Zlib\Apps::app_render($app,'nav'); + } } elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) { - $nav_apps[] = Zlib\Apps::app_render($app,'nav'); - if(strpos($app['categories'],'navbar_' . $template)) { + if(strpos($app['categories'],'nav_pinned_app') !== false) { $navbar_apps[] = Zlib\Apps::app_render($app,'navbar'); } + else { + $nav_apps[] = Zlib\Apps::app_render($app,'nav'); + } } } |