diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
| commit | f2f2b534e611c37105b1dc56470735c13641c944 (patch) | |
| tree | 2eed3379df931bccd56dd7be8e3a56394fa3e0f9 /Zotlabs/Lib | |
| parent | 2d9ae8ff2c581b8981c9c7308c4cf98bfee934b1 (diff) | |
| parent | a9bda2b12e3d393fa854e23207a081052e2e7bfd (diff) | |
| download | volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.gz volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.bz2 volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 0ca2f7a99..edf050b95 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -219,7 +219,7 @@ class Apps { 'Suggest Channels' => t('Suggest Channels'), 'Login' => t('Login'), 'Channel Manager' => t('Channel Manager'), - 'Grid' => t('Grid'), + 'Grid' => t('Activity'), 'Settings' => t('Settings'), 'Files' => t('Files'), 'Webpages' => t('Webpages'), @@ -245,9 +245,19 @@ class Apps { 'Profile Photo' => t('Profile Photo') ); - if(array_key_exists($arr['name'],$apps)) { - $arr['name'] = $apps[$arr['name']]; + if(array_key_exists('name',$arr)) { + if(array_key_exists($arr['name'],$apps)) { + $arr['name'] = $apps[$arr['name']]; + } + } + else { + for($x = 0; $x < count($arr); $x++) { + if(array_key_exists($arr[$x]['name'],$apps)) { + $arr[$x]['name'] = $apps[$arr[$x]['name']]; + } + } } + } |