diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-11-01 12:08:59 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-11-01 12:08:59 +0100 |
commit | 11cdc36bcc7414002c2e72fd0c45d285d9515f0c (patch) | |
tree | ffcb15dd536800b67c9918756e41bb4accde3320 /include/nav.php | |
parent | b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d (diff) | |
parent | 22d45a8d1ecfa0a0a2b8429ec3233e7099e84b66 (diff) | |
download | volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.tar.gz volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.tar.bz2 volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/nav.php')
-rw-r--r-- | include/nav.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nav.php b/include/nav.php index 89947e270..af0ebbae2 100644 --- a/include/nav.php +++ b/include/nav.php @@ -312,7 +312,7 @@ EOT; '$pleasewait' => t('Please wait...'), '$nav_apps' => $nav_apps, '$navbar_apps' => $navbar_apps, - '$channel_menu' => get_config('system','channel_menu'), + '$channel_menu' => get_pconfig(App::$profile_uid,'system','channel_menu',get_config('system','channel_menu')), '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), '$channel_apps' => $channel_apps, '$addapps' => t('Add Apps'), |