also decode html entities in the title

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 8135f9adb3d8071aedb30960952c803a3c95c310..c8d222edbadac2d857f64cc6fefc64d77f8391e8 100644 (file)
--- 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};
        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));
        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 1ee1b8fdb9bf52bae52d67b517f0a2032287e23d..5e1d98a7248a643d438bfb88086c3ac2d906df5a 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -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(
                "url=".urlto($params{page}, "")."\n".
        $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"
        );
                "modtime=$IkiWiki::pagemtime{$params{page}}\n".
                "size=".length($params{content})."\n"
        );

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index f65f4221241fb2b93e0028f70b862ccc8bc24b55..00521c441b10c1999e4d576ab228eb2d82770427 100644 (file)
--- 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"
 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"
 "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 ""
 
 msgid "at noon on %A"
 msgstr ""
 

-#: ../IkiWiki/Plugin/recentchanges.pm:74
+#: ../IkiWiki/Plugin/recentchanges.pm:82

 msgid "missing page"
 msgstr ""
 
 msgid "missing page"
 msgstr ""
 

-#: ../IkiWiki/Plugin/recentchanges.pm:76
+#: ../IkiWiki/Plugin/recentchanges.pm:84

 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""