]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/CGI.pm
* POSIX::strftime doesn't know about encodings and doesn't return a utf8
[ikiwiki.git] / IkiWiki / CGI.pm
index f589ca41da60d39d1d7f7d774598f891313403b2..d9c9fe82896c8f5a52490ccb7be3147684ace455 100644 (file)
@@ -485,6 +485,7 @@ sub cgi_editpage ($$) { #{{{
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);
                                $form->field("editcontent", value => $conflict, force => 1);
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);
                                $form->field("editcontent", value => $conflict, force => 1);
+                               $form->field(name => "comments", value => Encode::decode_utf8($form->field('comments')), force => 1);
                                $form->field("do", "edit)");
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');
                                $form->field("do", "edit)");
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');