aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorPaolo T <tuscanhobbit@users.noreply.github.com>2015-03-22 16:34:40 +0100
committerPaolo T <tuscanhobbit@users.noreply.github.com>2015-03-22 16:34:40 +0100
commit82fb1ca0caaae72b77b641d22e51d5ae1b188183 (patch)
treea2ecee4e65bc80300c62b5b327965b8118117ad3 /include/nav.php
parentff5c3b009fa25e87e294cd458d3de4b677270c64 (diff)
parente345d6793d5f6910dd230f661ca5d1a837b1b504 (diff)
downloadvolse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.gz
volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.bz2
volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.zip
Merge pull request #8 from friendica/master
merging red master into nuvola.red
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/nav.php b/include/nav.php
index 5e8317cfa..1134d1b48 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -176,10 +176,8 @@ EOT;
if(local_channel()) {
- $network_options = get_pconfig(local_channel(),'system','network_page_default');
- $nav['network'] = array('network' . (($network_options) ? '?f=&' . $network_options : ''),
- t('Matrix'), "", t('Your matrix'),'network_nav_btn');
+ $nav['network'] = array('network', t('Matrix'), "", t('Your matrix'),'network_nav_btn');
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'),'home_nav_btn');