[dw-free] make filter=0 work on reading pages

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/430795dcb3fc]

http://bugs.dwscoalition.org/show_bug.cgi?id=2120

Fix filter=0 so it works again.

Patch by yvi.

Files modified:

• cgi-bin/LJ/S2/FriendsPage.pm
• htdocs/manage/circle/filter.bml

--------------------------------------------------------------------------------
diff -r 7ceaf538627b -r 430795dcb3fc cgi-bin/LJ/S2/FriendsPage.pm
--- a/cgi-bin/LJ/S2/FriendsPage.pm	Sun Feb 21 17:06:55 2010 +0000
+++ b/cgi-bin/LJ/S2/FriendsPage.pm	Mon Feb 22 07:41:52 2010 +0000
@@ -116,7 +116,7 @@ sub FriendsPage
 
     # but we can't just use a filter, we have to make sure the person is allowed to
     my $filter;
-    if ( $cf && ( $u->equals( $remote ) || $cf->public ) ) {
+    if ( ( $get->{filter} ne "0" ) && $cf && ( $u->equals( $remote ) || $cf->public ) ) {
         $filter = $cf;
 
     # if we couldn't use the group, then we can throw an error, but ONLY IF they specified
diff -r 7ceaf538627b -r 430795dcb3fc htdocs/manage/circle/filter.bml
--- a/htdocs/manage/circle/filter.bml	Sun Feb 21 17:06:55 2010 +0000
+++ b/htdocs/manage/circle/filter.bml	Mon Feb 22 07:41:52 2010 +0000
@@ -17,7 +17,9 @@
         my $extra;
         if ( $POST{type} eq "allfilters" ) {
             my $view = $POST{'view'};
-            if ($view eq "showpeople") {
+            if ( $view eq "all" ) {
+                $extra = "?filter=0";
+            } elsif ($view eq "showpeople") {
                 $extra = "?show=P&filter=0";
             } elsif ($view eq "showcommunities") {
                 $extra = "?show=C&filter=0";
--------------------------------------------------------------------------------