move related code together

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6c8952d4553deb99d1435beddd5de21aae76771c..c458ea9dab55ef2b20e18cbe48b6191066dcfafd 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -391,10 +391,6 @@ sub sessioncgi ($$) { #{{{
        IkiWiki::check_canedit($page, $cgi, $session);
        $postcomment=0;
 
        IkiWiki::check_canedit($page, $cgi, $session);
        $postcomment=0;
 

-       my $editcontent = $form->field('editcontent') || '';
-       $editcontent =~ s/\r\n/\n/g;
-       $editcontent =~ s/\r/\n/g;
-

        # FIXME: check that the wiki is locked right now, because
        # if it's not, there are mad race conditions!
 
        # FIXME: check that the wiki is locked right now, because
        # if it's not, there are mad race conditions!
 


@@ -409,7 +405,6 @@ sub sessioncgi ($$) { #{{{
 
        my $anchor = "${comments_pagename}${i}";
 
 
        my $anchor = "${comments_pagename}${i}";
 

-       $editcontent =~ s/"/\\"/g;

        my $content = "[[!_comment format=$type\n";
 
        # FIXME: handling of double quotes probably wrong?
        my $content = "[[!_comment format=$type\n";
 
        # FIXME: handling of double quotes probably wrong?


@@ -446,6 +441,10 @@ sub sessioncgi ($$) { #{{{
 
        $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
 
        $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 

+       my $editcontent = $form->field('editcontent') || '';
+       $editcontent =~ s/\r\n/\n/g;
+       $editcontent =~ s/\r/\n/g;
+       $editcontent =~ s/"/\\"/g;

        $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
        # This is essentially a simplified version of editpage:
        $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
        # This is essentially a simplified version of editpage: