Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

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');