Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ab7c0eebb89be17b478a1be29bd31641ee7d0786..8138cd67f86d159c3a611a8e7a6a4a90765c3bbc 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -15,6 +15,8 @@ sub import {
        hook(type => "cgi", id => "search", call => \&cgi);
        hook(type => "disable", id => "search", call => \&disable);
        hook(type => "needsbuild", id => "search", call => \&needsbuild);
+               
+       eval q{ use Search::Xapian }; # load early to work around #622591
 }
 
 sub getsetup () {

diff --git a/debian/changelog b/debian/changelog
index fb1be285b3dd29360101cc95e28454b3cf1c2c73..da0a04ac40cf30e3610fca9478a9191c58760d5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * Fix escaping of html entities in permalinks.
   * Fix escaping of html entities in tag names.
   * Avoid using named capture groups in heredoc code for oldperl compatability.
+  * Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
+    before Image::Magick.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400