move related code together

master
Joey Hess 2008-12-12 15:19:01 -05:00
parent f3735891ca
commit 9557c7c890
1 changed files with 4 additions and 5 deletions

View File

@ -391,10 +391,6 @@ sub sessioncgi ($$) { #{{{
IkiWiki::check_canedit($page, $cgi, $session); IkiWiki::check_canedit($page, $cgi, $session);
$postcomment=0; $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 # FIXME: check that the wiki is locked right now, because
# if it's not, there are mad race conditions! # 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"; my $content = "[[!_comment format=$type\n";
# FIXME: handling of double quotes probably wrong? # 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"; $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
# This is essentially a simplified version of editpage: # This is essentially a simplified version of editpage: