[livejournal] r19917: LJSUP-8857: Updating commenting form

U   trunk/cgi-bin/LJ/Talk.pm

Modified: trunk/cgi-bin/LJ/Talk.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk.pm	2011-09-01 02:03:10 UTC (rev 19916)
+++ trunk/cgi-bin/LJ/Talk.pm	2011-09-01 02:08:00 UTC (rev 19917)
@@ -1920,6 +1920,7 @@
             $captcha_html .= LJ::html_text( { name => 'answer', size => 15 } );
             $captcha_html .= LJ::html_hidden( captcha_chal => $captcha_chal );
         }
+    $captcha_html =~ s/\n|\r//g;
 #    }
 
     my $show_logips = $journalu->{'opt_logcommentips'};
@@ -2010,7 +2011,7 @@
         'remote_can_comment'     => $remote_can_comment,
 
         'need_captcha'              => $opts->{do_captcha},
-        'captcha_html'              => LJ::ehtml($captcha_html),
+        'captcha_html'              => LJ::ejs($captcha_html),
         'comment_length_cap'        => LJ::CMAX_COMMENT,
         'show_spellcheck'           => $LJ::SPELLER ? 1 : 0,
         'show_logips'               => $show_logips,