[livejournal] r23200: LJSUP-13850: Dynamic lj-cut looks incorr...

[vadvs]

Committer: vadLJSUP-13850: Dynamic lj-cut looks incorrectly in e-mail

U trunk/cgi-bin/LJ/Comment.pm
U trunk/cgi-bin/cleanhtml.pl

Modified: trunk/cgi-bin/LJ/Comment.pm
===================================================================
--- trunk/cgi-bin/LJ/Comment.pm 2012-10-25 14:16:42 UTC (rev 23199)
+++ trunk/cgi-bin/LJ/Comment.pm 2012-10-25 14:26:42 UTC (rev 23200)
@@ -1515,7 +1515,7 @@

# add specific for HTML params
$t->param(parent_text => LJ::Talk::Post::blockquote($parent ? $parent->body_html
- : $entry->event_html ));
+ : $entry->event_html({ no_ljcut_collapse => 1 }) ));
$t->param(poster_text => LJ::Talk::Post::blockquote($self->body_html));

my $email_subject = $self->subject_html;

Modified: trunk/cgi-bin/cleanhtml.pl
===================================================================
--- trunk/cgi-bin/cleanhtml.pl 2012-10-25 14:16:42 UTC (rev 23199)
+++ trunk/cgi-bin/cleanhtml.pl 2012-10-25 14:26:42 UTC (rev 23200)
@@ -760,7 +760,9 @@
}
$data_ids = qq(data-widget='ljcut' data-widget-options='{ "journalid": "$journalid", "ditemid": "$ditemid", "cutid": "$cutcount" }');
}
- $newdata .= "( $etext ".Encode::decode_utf8(LJ::Lang::ml("ljcut.collapse"))." )";
+ $newdata .= "( $etext";
+ $newdata .= " ".Encode::decode_utf8(LJ::Lang::ml("ljcut.collapse"))."" unless $opts->{no_ljcut_collapse};
+ $newdata .= " )";
$newdata .= "" if $tag eq "div";
unless ($opts->{'cutpreview'}) {
push @eatuntil, $tag;