[dw-free] suspended journals shouldn't display adult content check
[commit: http://hg.dwscoalition.org/dw-free/rev/506fd96c8c0c]
http://bugs.dwscoalition.org/show_bug.cgi?id=340
When viewing a deleted/suspended journal, show the error message, not the
adult content check.
Patch by
afuna.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=340
When viewing a deleted/suspended journal, show the error message, not the
adult content check.
Patch by
Files modified:
- cgi-bin/Apache/LiveJournal.pm
--------------------------------------------------------------------------------
diff -r 24d531b41e6a -r 506fd96c8c0c cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm Sat Jun 27 12:51:08 2009 +0000
+++ b/cgi-bin/Apache/LiveJournal.pm Sat Jun 27 14:20:37 2009 +0000
@@ -491,9 +491,13 @@ sub trans
}
# we should show the page (no interstitial) if:
+ # the viewed user is deleted / suspended OR
# the remote user owns the journal we're viewing OR
# the remote user posted the entry we're viewing
- my $should_show_page = $remote && ($remote->can_manage($u) || ($entry && $remote->equals($poster)));
+ my $should_show_page = ! $u->is_visible ||
+ ( $remote &&
+ ( $remote->can_manage( $u ) || ( $entry && $remote->equals( $poster ) ) )
+ );
my %journal_pages = (
read => 1,
--------------------------------------------------------------------------------
