urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also decode html entities in the title

master
Joey Hess 2008-06-04 01:50:51 -04:00
parent ded3ea2ccf
commit 27376abb3c
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/recentchanges.pm
View File

@ -39,6 +39,14 @@ sub pagetemplate (@) { #{{{
my %params=@_; my %params=@_;
my $template=$params{template}; my $template=$params{template};
my $page=$params{page}; 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} && if ($config{rcs} && $page ne $config{recentchangespage} &&
$template->query(name => "recentchangesurl")) { $template->query(name => "recentchangesurl")) {
$template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));

9
IkiWiki/Plugin/search.pm
View File

@ -92,15 +92,14 @@ sub index (@) { #{{{
} }
} }
$sample=~s/\n/ /g; $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 # data used by omega
# Decode html entities in it, since omega re-encodes them.
eval q{use HTML::Entities};
$doc->set_data( $doc->set_data(
"url=".urlto($params{page}, "")."\n". "url=".urlto($params{page}, "")."\n".
"sample=$sample\n". "sample=".decode_entities($sample)."\n".
"caption=$title\n". "caption=".decode_entities($title)."\n".
"modtime=$IkiWiki::pagemtime{$params{page}}\n". "modtime=$IkiWiki::pagemtime{$params{page}}\n".
"size=".length($params{content})."\n" "size=".length($params{content})."\n"
); );

6
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -463,11 +463,11 @@ msgstr ""
msgid "at noon on %A" msgid "at noon on %A"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/recentchanges.pm:74 #: ../IkiWiki/Plugin/recentchanges.pm:82
msgid "missing page" msgid "missing page"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/recentchanges.pm:76 #: ../IkiWiki/Plugin/recentchanges.pm:84
#, perl-format #, perl-format
msgid "The page %s does not exist." msgid "The page %s does not exist."
msgstr "" msgstr ""