diff options
| author | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
| commit | 5ea7196e78d08550b3ec93d3b708f915b3b0057f (patch) | |
| tree | 07e5f865b6c83898d7ac508302a227509e8207fd /Zotlabs/Lib/Apps.php | |
| parent | d0c7c99d5e1eb27281431231640c7e8c019b90e1 (diff) | |
| parent | fcc47e69e424635fa54b2684329623d4f7694436 (diff) | |
| download | volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.gz volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.bz2 volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Lib/Apps.php')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index f11bb9628..7b980b8d3 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -564,7 +564,8 @@ class Apps { '$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true), '$pinned' => ((strpos($papp['categories'], 'nav_pinned_app') === false) ? false : true), '$navapps' => (($mode == 'nav') ? true : false), - '$order' => (($mode == 'nav-order') ? true : false), + '$order' => (($mode === 'nav-order' || $mode === 'nav-order-pinned') ? true : false), + '$mode' => $mode, '$add' => t('Add to app-tray'), '$remove' => t('Remove from app-tray'), '$add_nav' => t('Pin to navbar'), @@ -959,9 +960,6 @@ class Apps { if($list) { foreach($list as $li) { $papp = self::app_encode($li); - if($menu !== 'nav_pinned_app' && strpos($papp['categories'],'nav_pinned_app') !== false) - continue; - $syslist[] = $papp; } } |