Merge pull request #6216 from MrPetovan/bug/6211-fix-contact-nets-all

Remove "all" value for nets parameter

diff --git a/mod/network.php b/mod/network.php
index 52daa2eefe6b842689baf26864c4426fd0530067..46861e39434a6058c2e95c14055a0d381b161822 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -65,7 +65,7 @@ function network_init(App $a)
        $cid = 0;
        if (!empty($_GET['cid'])) {
                $cid = $_GET['cid'];
-               $_GET['nets'] = 'all';
+               $_GET['nets'] = '';
                $group_id = 0;
        }
 
@@ -86,7 +86,7 @@ function network_init(App $a)
 
        // fetch last used network view and redirect if needed
        if (!$is_a_date_query) {
-               $sel_nets = defaults($_GET, 'nets', false);
+               $sel_nets = defaults($_GET, 'nets', '');
                $sel_tabs = network_query_get_sel_tab($a);
                $sel_groups = network_query_get_sel_group($a);
                $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
@@ -137,7 +137,7 @@ function network_init(App $a)
                        }
                }
 
-               if ($sel_nets !== false) {
+               if ($sel_nets) {
                        $net_args['nets'] = $sel_nets;
                }
 
@@ -151,11 +151,6 @@ function network_init(App $a)
                }
        }
 
-       // If nets is set to all, unset it
-       if (!empty($_GET['nets']) && $_GET['nets'] === 'all') {
-               unset($_GET['nets']);
-       }
-
        if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 938697f9cdd97ed27d2f7022644249274f02b51c..5166d5848e1463ba1dd8eb424339e2ce3ba67339 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -234,7 +234,7 @@ class Nav
                // The following nav links are only show to logged in users
                if (local_user()) {
                        $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
-                       $nav['net_reset'] = ['network/0?f=&order=comment&nets=all', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
+                       $nav['net_reset'] = ['network/?f=', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
 
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
 

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 3cfe70540005927f319da65e478261fa8c544ef1..d12f003c2e2a24e05e235022fc0754a758d57c63 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -40,9 +40,6 @@ class Contact extends BaseModule
                }
 
                $nets = defaults($_GET, 'nets', '');
-               if ($nets == 'all') {
-                       $nets = '';
-               }
 
                if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index b4c34f74e2ca3a08f7ca52207837f963f0143856..590af0205d2a52460e44509f188ce7612f1d0f85 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -46,7 +46,7 @@
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
                                                {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}

diff --git a/view/templates/nets.tpl b/view/templates/nets.tpl
index ea28bc665c2fbf3b9e4e0c0ef1576ba8c9cd5fc8..c27e8367cc33ffa9ddbfb5cafa86adf29fda969a 100644 (file)
--- a/view/templates/nets.tpl
+++ b/view/templates/nets.tpl
@@ -2,7 +2,7 @@
 <div id="nets-sidebar" class="widget">
        <h3>{{$title}}</h3>
        <div id="nets-desc">{{$desc}}</div>
-       <a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
+       <a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
        <ul role="menu" class="nets-ul">
        {{foreach $nets as $net}}
        <li role="menuitem" ><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index e7d90ca2861ff69530ba16256a4411ddc0b31e6b..3fa0bf50d12281920bdda439cb857fe826738641 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -62,7 +62,7 @@
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent|escape}}</a></li> -->
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent|escape}}</a></li> -->
                                                {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text|escape}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}

diff --git a/view/theme/frio/templates/nets.tpl b/view/theme/frio/templates/nets.tpl
index da637e7cf754c8b9d6887c326306d682e2017c31..4f9bfe22f4bade024ba714f1e4e4e65c4176ba37 100644 (file)
--- a/view/theme/frio/templates/nets.tpl
+++ b/view/theme/frio/templates/nets.tpl
@@ -3,7 +3,7 @@
        <h3>{{$title}}</h3>
        <div id="nets-desc">{{$desc}}</div>
        <ul role="menu" class="nets-ul">
-               <li role="menuitem" {{if $sel_all}}class="selected"{{/if}}><a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a></li>
+               <li role="menuitem" {{if $sel_all}}class="selected"{{/if}}><a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a></li>
                {{foreach $nets as $net}}
                <li role="menuitem" {{if $net.selected}}class="selected"{{/if}}><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
                {{/foreach}}

diff --git a/view/theme/quattro/templates/nets.tpl b/view/theme/quattro/templates/nets.tpl
index 981bd8d2c8d2bf726527b9bb851331e20f1510e4..c12f2c44dcba210e9935ed90ec0d8e9d9b77d329 100644 (file)
--- a/view/theme/quattro/templates/nets.tpl
+++ b/view/theme/quattro/templates/nets.tpl
@@ -3,7 +3,7 @@
        <div id="nets-desc">{{$desc}}</div>
        
        <ul class="nets-ul">
-               <li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}?nets=all" class="nets-link nets-all">{{$all}}</a>
+               <li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="nets-link nets-all">{{$all}}</a>
                {{foreach $nets as $net}}
                        <li class="tool {{if $net.selected}}selected{{/if}}"><a href="{{$base}}?f=&nets={{$net.ref}}" class="nets-link">{{$net.name}}</a></li>
                {{/foreach}}

diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index 9014be1d252356f5ee5d435ec8548d3cb98fbf6b..21f75ac94658b6d43468f80b0aaece385d70d51a 100644 (file)
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -47,7 +47,7 @@
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
                                                {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}