harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-07-26 22:09:01 -07:00
commit d3a5911932
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Lib/Apps.php
View File

@ -284,9 +284,6 @@ class Apps {
if(! $papp['photo']) if(! $papp['photo'])
$papp['photo'] = z_root() . '/' . get_default_profile_photo(80); $papp['photo'] = z_root() . '/' . get_default_profile_photo(80);
if(\App::$nav_sel['active'] == $papp['name'])
$papp['active'] = true;
self::translate_system_apps($papp); self::translate_system_apps($papp);
if(trim($papp['plugin']) && (! plugin_is_installed(trim($papp['plugin'])))) if(trim($papp['plugin']) && (! plugin_is_installed(trim($papp['plugin']))))

3
include/nav.php
View File

@ -242,6 +242,9 @@ EOT;
$syslist = Zlib\Apps::app_order(local_channel(),$syslist); $syslist = Zlib\Apps::app_order(local_channel(),$syslist);
foreach($syslist as $app) { foreach($syslist as $app) {
if(\App::$nav_sel['active'] == $app['name'])
$app['active'] = true;
if($is_owner) if($is_owner)
$nav_apps[] = Zlib\Apps::app_render($app,'nav'); $nav_apps[] = Zlib\Apps::app_render($app,'nav');
elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false)