diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
| commit | f840082aaead8356a5787109f0c67179ecdf7993 (patch) | |
| tree | 05fcb73fae9412706a04a44a3188a187375d3ca4 /include/nav.php | |
| parent | 47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff) | |
| parent | 3ccefa20e8b10d0a507c6b002237664e721ca389 (diff) | |
| download | volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2 volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/nav.php b/include/nav.php index fecf28548..849e19d9a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -43,7 +43,7 @@ EOT; require_once('include/conversation.php'); $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false); - $navapps[] = channel_apps($is_owner, App::$profile['channel_address']); + $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); $myident = (($channel) ? $channel['xchan_addr'] : ''); @@ -258,7 +258,7 @@ EOT; usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare'); foreach($syslist as $app) { - $navapps[] = Zlib\Apps::app_render($app,'nav'); + $nav_apps[] = Zlib\Apps::app_render($app,'nav'); } $tpl = get_markup_template('nav.tpl'); @@ -276,8 +276,10 @@ EOT; '$powered_by' => $powered_by, '$help' => t('@name, #tag, ?doc, content'), '$pleasewait' => t('Please wait...'), - '$navapps' => $navapps, - '$addapps' => t('Add Apps') + '$nav_apps' => $nav_apps, + '$channel_apps' => $channel_apps, + '$addapps' => t('Add Apps'), + '$sysapps_toggle' => t('Toggle System Apps') )); if(x($_SESSION, 'reload_avatar') && $observer) { @@ -480,4 +482,4 @@ function channel_apps($is_owner = false, $nickname = null) { '$thumb' => App::$profile['thumb'] ] ); -}
\ No newline at end of file +} |