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.

diff --git a/include/Contact.php b/include/Contact.php
index c83177ddaa2333117beab39c151a678adadc4ab9..04d3fa9e5d013a0a426b7c8af155fbd90edebdf9 100644 (file)
--- 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 d5f87567b9d7b91c7cb4ae7a388d71a1b8ba9458..5296011bb37e080a220f4eb024455b79115ac13c 100644 (file)
--- 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 c68ca7f1db67ef33ac15f27421729a65fbeb61cc..bec78bd7d97e74d0ccab507071a2bb35ab7a01d0 100644 (file)
--- 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 }}