From 929b9de9c2b0f3ed1a0c9e006d084519bd5e0479 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 3 Jul 2006 20:18:16 +0000
Subject: [PATCH] Encode is used in nearly all code paths so stop loading it on
demand
---
IkiWiki.pm | 4 ++--
IkiWiki/CGI.pm | 3 +--
IkiWiki/Render.pm | 3 +--
debian/changelog | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4be5612f1..7be1c7f58 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,7 +3,8 @@
package IkiWiki;
use warnings;
use strict;
-use encoding "utf8";
+use encoding "utf8"; # force use of utf8 for io layer
+use Encode;
use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
%renderedfiles %pagesources %depends %hooks};
@@ -393,7 +394,6 @@ sub saveindex () { #{{{
sub template_params (@) { #{{{
my $filename=shift;
- require Encode;
require HTML::Template;
return filter => sub {
my $text_ref = shift;
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 {
diff --git a/debian/changelog b/debian/changelog
index a7e5f676f..eefa9e19c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,7 @@ ikiwiki (1.8) UNRELEASED; urgency=low
to be read as utf8.
* Support pages with utf8 filenames. Patch by Faidon Liambotis.
- -- Joey Hess <joeyh@debian.org> Mon, 3 Jul 2006 16:09:16 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 3 Jul 2006 16:17:20 -0400
ikiwiki (1.7) unstable; urgency=low
--
2.39.5