aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-04 23:53:05 -0700
committerfriendica <info@friendica.com>2014-10-04 23:53:05 -0700
commit9135ad30d8b964b292777d6671f6fe004462d0ce (patch)
tree1944d15c745d2d8d62affc93fba35375cf764a70
parentb0544cc9e70197d698987c234ad63ef812861e31 (diff)
downloadvolse-hubzilla-9135ad30d8b964b292777d6671f6fe004462d0ce.tar.gz
volse-hubzilla-9135ad30d8b964b292777d6671f6fe004462d0ce.tar.bz2
volse-hubzilla-9135ad30d8b964b292777d6671f6fe004462d0ce.zip
network page default option
-rw-r--r--include/nav.php5
-rw-r--r--version.inc2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php
index c35466412..7c9abce49 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -185,7 +185,10 @@ EOT;
if(local_user()) {
- $nav['network'] = array('network', t('Matrix'), "", t('Your matrix'));
+ $network_options = get_pconfig(local_user(),'system','network_page_default');
+
+ $nav['network'] = array('network' . (($network_options) ? '?f=&' . $network_options : ''),
+ t('Matrix'), "", t('Your matrix'));
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'));
diff --git a/version.inc b/version.inc
index ff57af75f..712d00b5b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-03.817
+2014-10-04.818