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] 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 c83177dd..04d3fa9e 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 d5f87567..5296011b 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 c68ca7f1..bec78bd7 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 }}