diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /include/nav.php | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/nav.php b/include/nav.php index a97b434bc..2d0d43d5a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -138,8 +138,8 @@ EOT; if(! get_config('system','hide_help')) $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); - if(count($a->get_apps()) > 0) - $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games')); + + $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games')); $nav['search'] = array('search', t('Search'), "", t('Search site content')); @@ -221,7 +221,6 @@ EOT; '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, - '$apps' => $a->get_apps(), '$pleasewait' => t('Please wait...') )); |