[livejournal] r21722: LJSUP-11850: We should display post with...

LJSUP-11850: We should display post with closed lj-cut in all notifications

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-04-16 11:12:46 UTC (rev 21721)
+++ trunk/cgi-bin/LJ/Comment.pm	2012-04-16 14:10:41 UTC (rev 21722)
@@ -1308,7 +1308,14 @@
             $body .= "<table><tr valign='top'><td width='100%'>$intro</td></tr></table>\n";
         }
 
-        $body .= blockquote($parent ? $parent->body_html : $entry->event_html);
+        my $text = '';
+        if ($parent) {
+            $text = $parent->body_html;
+        } else {
+            $text = $entry->event_html({ cuturl => $entry->url });
+        }
+
+        $body .= blockquote($text);
     } else {
         $body .= $intro . "\n\n" . indent($parent ? $parent->body_raw : $entry->event_raw, ">");
     }

Modified: trunk/cgi-bin/cleanhtml.pl
===================================================================
--- trunk/cgi-bin/cleanhtml.pl	2012-04-16 11:12:46 UTC (rev 21721)
+++ trunk/cgi-bin/cleanhtml.pl	2012-04-16 14:10:41 UTC (rev 21722)
@@ -697,7 +697,7 @@
                 next TOKEN if $ljcut_disable;
                 $cutcount++;
                 my $link_text = sub {
-                    my $text =  BML::ml('fcklang.readmore');
+                    my $text =  LJ::Lang::ml('fcklang.readmore');
                     $text = Encode::decode_utf8($text) if $text;
                     if ($attr->{'text'}) {
                         $text = $attr->{'text'};