decode html entities

[ikiwiki.git] / IkiWiki / Plugin / search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index aa0a8085e16867c3cc54fbe1aeacd3481ef9a6d3..1ee1b8fdb9bf52bae52d67b517f0a2032287e23d 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -92,6 +92,9 @@ 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
        $doc->set_data(
@@ -119,7 +122,7 @@ sub index (@) { #{{{
 sub delete (@) { #{{{
        my $db=xapiandb();
        foreach my $page (@_) {
-               $db->delete_document_by_term(pageterm($page));
+               $db->delete_document_by_term(pageterm(pagename($page)));
        }
 } #}}}