aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-15 17:10:53 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-15 17:10:53 +0000
commitdfedb0351d154cd1d58e719012f4b1dda3a07666 (patch)
tree83747d9b398698544cf98e906be99e016c7eaa21
parentc1b3572d4d2d9737537441bf7e87f98de1b0075d (diff)
downloadikiwiki-dfedb0351d154cd1d58e719012f4b1dda3a07666.tar
ikiwiki-dfedb0351d154cd1d58e719012f4b1dda3a07666.tar.gz
* Patch from Recai to fix a wide character warning from the search plugin
during setup if the wikiname contains utf8.
-rw-r--r--IkiWiki/Plugin/search.pm2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 4ae9d7283..2d8c3d4e1 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -79,7 +79,7 @@ sub estcfg () { #{{{
my $estdir="$config{wikistatedir}/hyperestraier";
my $cgi=IkiWiki::basename($config{cgiurl});
$cgi=~s/\..*$//;
- open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
+ open(TEMPLATE, ">:utf8", "$estdir/$cgi.tmpl") ||
error("write $estdir/$cgi.tmpl: $!");
print TEMPLATE IkiWiki::misctemplate("search",
"<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
diff --git a/debian/changelog b/debian/changelog
index 4b42a933e..93d2973cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,10 @@ ikiwiki (1.27) UNRELEASED; urgency=low
* Change ddate plugin to use the DateTime::Calendar::Discordian perl module.
* Fix a baseurl problem in hyperestradier search results.
* Add a stub local.css to avoid problems with 404's.
+ * Patch from Recai to fix a wide character warning from the search plugin
+ during setup if the wikiname contains utf8.
- -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 13:02:48 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 13:10:06 -0400
ikiwiki (1.26) unstable; urgency=low