[livejournal] r17853: LJSUP-7501 (Return of the ru_news notifi...
Committer: ailyin
LJSUP-7501 (Return of the ru_news notifications broken layout problem)U trunk/cgi-bin/LJ/Entry.pm
Modified: trunk/cgi-bin/LJ/Entry.pm
===================================================================
--- trunk/cgi-bin/LJ/Entry.pm 2010-12-02 09:29:10 UTC (rev 17852)
+++ trunk/cgi-bin/LJ/Entry.pm 2010-12-02 10:59:58 UTC (rev 17853)
@@ -800,12 +800,15 @@
my ($self, $opts) = @_;
if (! defined $opts) {
- $self->_load_props unless $self->{_loaded_props};
- $opts = { preformatted => $self->{props}{opt_preformatted} };
+ $opts = {};
} elsif (! ref $opts) {
$opts = { preformatted => $opts };
}
+ unless ( exists $opts->{'preformatted'} ) {
+ $opts->{'preformatted'} = $self->prop('opt_preformatted');
+ }
+
my $remote = LJ::get_remote();
my $suspend_msg = $self->should_show_suspend_msg_to($remote) ? 1 : 0;
$opts->{suspend_msg} = $suspend_msg;
