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

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 7b41bbde9152da89dad16937a9e0bca3f122f933..284f477fae5b32f63f9c9159f06c4af84dea2acd 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -194,9 +194,10 @@ sub xapiandb () { #{{{
        return $db;
 } #}}}
 
-my $setup;
+{
+my $setup=0;
 sub setupfiles () { #{{{
-       if (! defined $setup and ! -e $config{wikistatedir}."/xapian" || $config{rebuild}) {
+       if (! $setup and (! -e $config{wikistatedir}."/xapian" || $config{rebuild})) {
                writefile("omega.conf", $config{wikistatedir}."/xapian",
                        "database_dir .\n".
                        "template_dir ./templates\n");
@@ -206,5 +207,6 @@ sub setupfiles () { #{{{
                $setup=1;
        }
 } #}}}
+}
 
 1