Refactor equality tests in support/see_request.bml.
(This was committed once before, but pulled from production.)
Patch by kareila.
diffs (32 lines):
diff -r 61ae622166cb -r b559ece4948b htdocs/support/see_request.bml
--- a/htdocs/support/see_request.bml Tue Aug 24 11:26:53 2010 -0500
+++ b/htdocs/support/see_request.bml Tue Aug 24 22:46:31 2010 -0500
@@ -552,19 +552,18 @@ body<=
$most_recent_tier = $le->{tier};
}
- 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'} )));
+ my $up = LJ::load_userid( $le->{userid} );
+ my $remote_is_up = $remote && $remote->equals( $up );
- my $up = LJ::load_userid($le->{'userid'});
- next if ($le->{'type'} eq "screened") && $up && !$up->is_visible;
+ 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;
- if ($le->{'type'} eq "screened") {
- push @screened, $le;
- }
+ push @screened, $le if $le->{type} eq "screened";
- my $message = $le->{'message'};
+ my $message = $le->{message};
my %url;
my $urlN = 0;
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
