diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-06-04 01:50:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-06-04 01:50:51 -0400 |
| commit | 27376abb3c73e6d1e5d5743b8ddc1dc4790a60e7 (patch) | |
| tree | f764b660fde26243e7faed34859c31ab6ccf2083 | |
| parent | ded3ea2ccf074bed551d1feedf3d6b2f264589a0 (diff) | |
| download | ikiwiki-27376abb3c73e6d1e5d5743b8ddc1dc4790a60e7.tar ikiwiki-27376abb3c73e6d1e5d5743b8ddc1dc4790a60e7.tar.gz | |
also decode html entities in the title
| -rw-r--r-- | IkiWiki/Plugin/recentchanges.pm | 8 | ||||
| -rw-r--r-- | IkiWiki/Plugin/search.pm | 9 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 8135f9adb..c8d222edb 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -39,6 +39,14 @@ sub pagetemplate (@) { #{{{ my %params=@_; my $template=$params{template}; my $page=$params{page}; + + # XXX this is here because I've been seeing a strange uninitialized + # value in this sub. + if (! defined $page) { + eval q{use Carp}; + Carp::cluck("undefined page; please report this to Joey"); + } + if ($config{rcs} && $page ne $config{recentchangespage} && $template->query(name => "recentchangesurl")) { $template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 1ee1b8fdb..5e1d98a72 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -92,15 +92,14 @@ sub index (@) { #{{{ } } $sample=~s/\n/ /g; - # Decode html entities in the sample since omega encodes them. - eval q{use HTML::Entities}; - $sample=decode_entities($sample); # data used by omega + # Decode html entities in it, since omega re-encodes them. + eval q{use HTML::Entities}; $doc->set_data( "url=".urlto($params{page}, "")."\n". - "sample=$sample\n". - "caption=$title\n". + "sample=".decode_entities($sample)."\n". + "caption=".decode_entities($title)."\n". "modtime=$IkiWiki::pagemtime{$params{page}}\n". "size=".length($params{content})."\n" ); diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index f65f42212..00521c441 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-04 01:17-0400\n" +"POT-Creation-Date: 2008-06-04 01:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -463,11 +463,11 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:74 +#: ../IkiWiki/Plugin/recentchanges.pm:82 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/recentchanges.pm:76 +#: ../IkiWiki/Plugin/recentchanges.pm:84 #, perl-format msgid "The page %s does not exist." msgstr "" |