Encode:: cleanup from Recai

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 424ce2c78493d5ecb21dee5f56787e54b1f23700..3b4228b75bbf84debebc38b55b07ed91cd25ecd7 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -316,7 +316,7 @@ sub cgi_editpage ($$) { #{{{
        
        # This untaint is safe because titlepage removes any problimatic
        # characters.
        
        # This untaint is safe because titlepage removes any problimatic
        # characters.

-       my ($page)=Encode::decode_utf8($form->param('page'));
+       my ($page)=decode_utf8($form->param('page'));

        $page=titlepage(possibly_foolish_untaint(lc($page)));
        if (! defined $page || ! length $page ||
            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
        $page=titlepage(possibly_foolish_untaint(lc($page)));
        if (! defined $page || ! length $page ||
            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {


@@ -363,8 +363,8 @@ sub cgi_editpage ($$) { #{{{
                require IkiWiki::Render;
                # Apparently FormBuilder doesn't not treat input as
                # utf-8, so decode from it.
                require IkiWiki::Render;
                # Apparently FormBuilder doesn't not treat input as
                # utf-8, so decode from it.

-               my $content = Encode::decode_utf8($form->field('editcontent'));
-               my $comments = Encode::decode_utf8($form->field('comments'));
+               my $content=decode_utf8($form->field('editcontent'));
+               my $comments=decode_utf8($form->field('comments'));

                $form->field(name => "editcontent",
                                value => $content, force => 1);
                $form->field(name => "comments",
                $form->field(name => "editcontent",
                                value => $content, force => 1);
                $form->field(name => "comments",


@@ -452,7 +452,7 @@ sub cgi_editpage ($$) { #{{{
                page_locked($page, $session);
                
                # Decode utf-8 since FormBuilder does not
                page_locked($page, $session);
                
                # Decode utf-8 since FormBuilder does not

-               my $content=Encode::decode_utf8($form->field('editcontent'));
+               my $content=decode_utf8($form->field('editcontent'));

 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;


@@ -468,7 +468,7 @@ sub cgi_editpage ($$) { #{{{
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {

-                       $message.=": ".Encode::decode_utf8($form->field('comments'));
+                       $message.=": ".decode_utf8($form->field('comments'));

                }
                
                if ($config{rcs}) {
                }
                
                if ($config{rcs}) {


@@ -487,7 +487,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(name => "comments", value => 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');

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ab43717c6188a761ccafb8b8d4c1b16802ed59ad..6d5ea9ee587ebe470d6ee2b55d681f659da73572 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -222,7 +222,7 @@ sub displaytime ($) { #{{{
        eval q{use POSIX};
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        eval q{use POSIX};
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8

-       return Encode::decode_utf8(POSIX::strftime(
+       return decode_utf8(POSIX::strftime(

                        $config{timeformat}, localtime($time)));
 } #}}}
 
                        $config{timeformat}, localtime($time)));
 } #}}}
 


@@ -310,7 +310,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

-                       $_ = Encode::decode_utf8($_);
+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }


@@ -330,7 +330,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
        find({
                no_chdir => 1,
                wanted => sub {

-                       $_ = Encode::decode_utf8($_);
+                       $_=decode_utf8($_);

                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }