From c0af9b2938bca3accccf2f6e6ae97c562e96b3ce Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Fri, 1 Feb 2013 09:12:37 +0100
Subject: [PATCH 1/2] Reset network when showing a contact's posts

There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
---
 include/Contact.php      | 2 +-
 include/conversation.php | 2 +-
 view/contact_edit.tpl    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index c83177ddaa..04d3fa9e5d 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -219,7 +219,7 @@ function contact_photo_menu($contact) {
 
 	$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
 	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
-	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
+	$posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
 
 	$menu = Array(
 		'poke' => array(t("Poke"), $poke_link),
diff --git a/include/conversation.php b/include/conversation.php
index d5f87567b9..5296011bb3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -795,7 +795,7 @@ function item_photo_menu($item){
 	if(($cid) && (! $item['self'])) {
 		$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
 		$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
-		$posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
+		$posts_link = $a->get_baseurl($ssl_state) . '/network/0?nets=all&cid=' . $cid;
 
 		$clean_url = normalise_link($item['author-link']);
 
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index c68ca7f1db..bec78bd7d9 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -43,7 +43,7 @@
 				{{ endif }}
 
 
-				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
 				{{ if $lblsuggest }}
 					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
 				{{ endif }}

From 7db626b1b516a976979e4d93eb2de4192f1f27a8 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Fri, 1 Feb 2013 20:37:16 +0100
Subject: [PATCH 2/2] also reset network in mobile themes, smarty3 updates

---
 view/smarty3/contact_edit.tpl                    | 2 +-
 view/theme/decaf-mobile/contact_edit.tpl         | 2 +-
 view/theme/decaf-mobile/smarty3/contact_edit.tpl | 2 +-
 view/theme/frost-mobile/contact_edit.tpl         | 2 +-
 view/theme/frost-mobile/smarty3/contact_edit.tpl | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
index 5ba2abe721..6d65288e42 100644
--- a/view/smarty3/contact_edit.tpl
+++ b/view/smarty3/contact_edit.tpl
@@ -48,7 +48,7 @@
 				{{/if}}
 
 
-				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
 				{{if $lblsuggest}}
 					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 				{{/if}}
diff --git a/view/theme/decaf-mobile/contact_edit.tpl b/view/theme/decaf-mobile/contact_edit.tpl
index 908212b48c..e113018b31 100644
--- a/view/theme/decaf-mobile/contact_edit.tpl
+++ b/view/theme/decaf-mobile/contact_edit.tpl
@@ -48,7 +48,7 @@
 				{{ endif }}
 
 
-				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
 				{{ if $lblsuggest }}
 					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
 				{{ endif }}
diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
index bced55ac3c..0f028d5904 100644
--- a/view/theme/decaf-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
@@ -53,7 +53,7 @@
 				{{/if}}
 
 
-				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
 				{{if $lblsuggest}}
 					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 				{{/if}}
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl
index b87b3b651c..d4bd41d74b 100644
--- a/view/theme/frost-mobile/contact_edit.tpl
+++ b/view/theme/frost-mobile/contact_edit.tpl
@@ -48,7 +48,7 @@
 				{{ endif }}
 
 
-				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
 				{{ if $lblsuggest }}
 					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
 				{{ endif }}
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
index 516fe02ca7..b18fff6b4a 100644
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl
@@ -53,7 +53,7 @@
 				{{/if}}
 
 
-				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
 				{{if $lblsuggest}}
 					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 				{{/if}}