[dw-free] more aggressive adoption of $u->equals

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/2870a0a553f5]

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

Anonymous (undef $u) needs to still work.

Patch by mark.

Files modified:

• htdocs/support/see_request.bml

--------------------------------------------------------------------------------
diff -r d7c12ffffc2c -r 2870a0a553f5 htdocs/support/see_request.bml
--- a/htdocs/support/see_request.bml	Thu Jul 29 08:01:21 2010 +0000
+++ b/htdocs/support/see_request.bml	Thu Jul 29 08:07:28 2010 +0000
@@ -371,7 +371,7 @@ body<=
     $ret .= LJ::name_caps($u->{'caps'}) || "<i>$ML{'.unknown'}</i>";
     $ret .= "</td></tr>\n";
 
-    if ( $u->userid ) {
+    if ($u->{'userid'}) {
         $ret .= "<tr valign='top'><td align='right'><b>$LJ::SITENAMESHORT:</b></td><td>";
 
         if ($u->is_expunged) {
@@ -552,18 +552,19 @@ body<=
             $most_recent_tier = $le->{tier};
         }
 
-        my $up = LJ::load_userid( $le->{userid} );
-        my $remote_is_up = $remote && $remote->equals( $up );
+        next if ($le->{'type'} eq "internal" && ! (LJ::Support::can_read_internal($sp, $remote) ||
+                                                   ($remote && $remote->{'userid'} == $le->{'userid'} )));
+        next if ($le->{'type'} eq "screened" && ! (LJ::Support::can_read_screened($sp, $remote) ||
+                                                   ($remote && $remote->{'userid'} == $le->{'userid'} )));
 
-        next if $le->{type} eq "internal" && ! ( LJ::Support::can_read_internal( $sp, $remote )
-                                                 || $remote_is_up );
-        next if $le->{type} eq "screened" && ! ( LJ::Support::can_read_screened( $sp, $remote )
-                                                 || $remote_is_up );
-        next if $le->{type} eq "screened" && $up && !$up->is_visible;
+        my $up = LJ::load_userid($le->{'userid'});
+        next if ($le->{'type'} eq "screened") && $up && !$up->is_visible;
 
-        push @screened, $le if $le->{type} eq "screened";
+        if ($le->{'type'} eq "screened") {
+            push @screened, $le;
+        }
 
-        my $message = $le->{message};
+        my $message = $le->{'message'};
         my %url;
         my $urlN = 0;
 
--------------------------------------------------------------------------------