diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-26 22:09:01 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-26 22:09:01 -0700 |
| commit | d3a5911932201eda2328123873d75e8c13cb9a89 (patch) | |
| tree | 03f5ffd3d5c8b7c07a8b1084178cb9dafabb2fd1 | |
| parent | dbbae4bac81d18f814c18ac8d0ea51667e00703f (diff) | |
| parent | e71cdf02a8303689c933b98185e2671f49fc5a7d (diff) | |
| download | volse-hubzilla-d3a5911932201eda2328123873d75e8c13cb9a89.tar.gz volse-hubzilla-d3a5911932201eda2328123873d75e8c13cb9a89.tar.bz2 volse-hubzilla-d3a5911932201eda2328123873d75e8c13cb9a89.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 3 | ||||
| -rw-r--r-- | include/nav.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 08f054eaf..68587df49 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -284,9 +284,6 @@ class Apps { if(! $papp['photo']) $papp['photo'] = z_root() . '/' . get_default_profile_photo(80); - if(\App::$nav_sel['active'] == $papp['name']) - $papp['active'] = true; - self::translate_system_apps($papp); if(trim($papp['plugin']) && (! plugin_is_installed(trim($papp['plugin'])))) diff --git a/include/nav.php b/include/nav.php index 4cb2e7fa6..cd32126a1 100644 --- a/include/nav.php +++ b/include/nav.php @@ -242,6 +242,9 @@ EOT; $syslist = Zlib\Apps::app_order(local_channel(),$syslist); foreach($syslist as $app) { + if(\App::$nav_sel['active'] == $app['name']) + $app['active'] = true; + if($is_owner) $nav_apps[] = Zlib\Apps::app_render($app,'nav'); elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) |