[livejournal] r21767: LJSUP-11850: We should display post with...
Committer: sbelyaev
LJSUP-11850: We should display post with closed lj-cut in all notificationsU trunk/cgi-bin/LJ/Comment.pm U trunk/cgi-bin/LJ/Event/JournalNewComment.pm
Modified: trunk/cgi-bin/LJ/Comment.pm
===================================================================
--- trunk/cgi-bin/LJ/Comment.pm 2012-04-20 11:23:01 UTC (rev 21766)
+++ trunk/cgi-bin/LJ/Comment.pm 2012-04-20 12:24:57 UTC (rev 21767)
@@ -1312,7 +1312,12 @@
if ($parent) {
$text = $parent->body_html;
} else {
+ my $language_old = LJ::Lang::current_language;
+ LJ::Lang::current_language($lang);
+
$text = $entry->event_html({ cuturl => $entry->url });
+
+ LJ::Lang::current_language($language_old);
}
$body .= blockquote($text);
Modified: trunk/cgi-bin/LJ/Event/JournalNewComment.pm
===================================================================
--- trunk/cgi-bin/LJ/Event/JournalNewComment.pm 2012-04-20 11:23:01 UTC (rev 21766)
+++ trunk/cgi-bin/LJ/Event/JournalNewComment.pm 2012-04-20 12:24:57 UTC (rev 21767)
@@ -143,8 +143,6 @@
my ($self, $u) = @_;
my $comment = $self->comment or return "(Invalid comment)";
- LJ::set_remote($u);
-
my $filename = $self->template_file_for(section => 'body_text', lang => $u->prop('browselang'));
if ($filename) {
# Load template file into template processor
@@ -160,8 +158,6 @@
my ($self, $u) = @_;
my $comment = $self->comment or return "(Invalid comment)";
- LJ::set_remote($u);
-
my $filename = $self->template_file_for(section => 'body_html', lang => $u->prop('browselang'));
if ($filename) {
# Load template file into template processor
