* POSIX::strftime doesn't know about encodings and doesn't return a utf8

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 0d763caa38ec942e540a1b36b5e579c08841c054..d9c9fe82896c8f5a52490ccb7be3147684ace455 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
+use encoding 'utf8'; # force use of utf8 for io layer
 
 package IkiWiki;
 
@@ -32,6 +33,11 @@ sub cgi_recentchanges ($) { #{{{
        
        unlockwiki();
 
+       # Force reading the template as utf-8, necessary if
+       # rcs_recentchanges returns true utf-8 strings.
+       open(TMPL, "<:utf8", "$config{templatedir}/recentchanges.tmpl");
+       my $template=HTML::Template->new(filehandle => *TMPL);
+       close(TMPL);
        my $template=HTML::Template->new(
                filename => "$config{templatedir}/recentchanges.tmpl"
        );
@@ -43,9 +49,7 @@ sub cgi_recentchanges ($) { #{{{
                styleurl => styleurl(),
                baseurl => "$config{url}/",
        );
-       # XXX why is this needed? If it's raw utf-8 won't print DTRT?
-       require Encode;
-       print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);
+       print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -358,7 +362,10 @@ sub cgi_editpage ($$) { #{{{
                # utf-8, so decode from it.
                require Encode;
                my $content = Encode::decode_utf8($form->field('editcontent'));
-               $form->field(name => "editcontent", value => $content, force => 1);
+               $form->field(name => "editcontent",
+                               value => $content, force => 1);
+               $form->field(name => "comments",
+                               value => Encode::decode_utf8($form->field('comments')), force => 1);
                $form->tmpl_param("page_preview",
                        htmlize($config{default_pageext},
                                linkify($page, $page, $content)));
@@ -441,13 +448,17 @@ sub cgi_editpage ($$) { #{{{
                # save page
                page_locked($page, $session);
                
-               my $content=$form->field('editcontent');
+               # Decode utf-8 since FormBuilder does not
+               require Encode;
+               my $content=Encode::decode_utf8($form->field('editcontent'));
+
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile($file, $config{srcdir}, $content);
                
                my $message="web commit ";
-               if (length $session->param("name")) {
+               if (defined $session->param("name") && 
+                   length $session->param("name")) {
                        $message.="by ".$session->param("name");
                }
                else {
@@ -455,8 +466,6 @@ sub cgi_editpage ($$) { #{{{
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {
-                       # Decode utf-8 since FormBuilder does not.
-                       require Encode;
                        $message.=Encode::decode_utf8(": ".$form->field('comments'));
                }
                
@@ -476,6 +485,7 @@ sub cgi_editpage ($$) { #{{{
                                        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');