diff options
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/CGI.pm | 3 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index b2d126977..73afe2468 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -5,6 +5,7 @@ use strict; use IkiWiki; use IkiWiki::UserInfo; use encoding 'utf8'; # force use of utf8 for io layer +use Encode; package IkiWiki; @@ -352,7 +353,6 @@ sub cgi_editpage ($$) { #{{{ require IkiWiki::Render; # Apparently FormBuilder doesn't not treat input as # utf-8, so decode from it. - require Encode; my $content = Encode::decode_utf8($form->field('editcontent')); my $comments = Encode::decode_utf8($form->field('comments')); $form->field(name => "editcontent", @@ -442,7 +442,6 @@ sub cgi_editpage ($$) { #{{{ page_locked($page, $session); # Decode utf-8 since FormBuilder does not - require Encode; my $content=Encode::decode_utf8($form->field('editcontent')); $content=~s/\r\n/\n/g; diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index e778ff20c..960d1da1e 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -6,6 +6,7 @@ use warnings; use strict; use File::Spec; use IkiWiki; +use Encode; sub linkify ($$$) { #{{{ my $lpage=shift; @@ -31,7 +32,6 @@ sub htmlize ($$) { #{{{ $blosxom::version="is a proper perl module too much to ask?"; use warnings 'all'; do "/usr/bin/markdown"; - require Encode; } if ($type eq '.mdwn') { @@ -324,7 +324,6 @@ sub refresh () { #{{{ my %exists; my @files; eval q{use File::Find}; - require Encode; find({ no_chdir => 1, wanted => sub { |