bugfixes

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 529a2c801fedbe08a4e10f3e472479f334745a82..85467fa0b8b24271cc76ec86ad3380758c9637d6 100644 (file)
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -28,7 +28,7 @@ sub checkconfig () {
        
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.
        
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.

-       add_depends("", "googleform.tmpl");
+       add_depends("", "templates/googleform.tmpl");

 }
 
 my $form;
 }
 
 my $form;

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c9a69f443e3f6ce165840d860908b708fcad7741..be39fdf1e4046a7b4e404800ca68cc1890b76860 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -44,7 +44,7 @@ sub checkconfig () {
 
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.
 
        # This is a mass dependency, so if the search form template
        # changes, every page is rebuilt.

-       add_depends("", "searchform.tmpl");
+       add_depends("", "templates/searchform.tmpl");

 }
 
 my $form;
 }
 
 my $form;

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 50af2bdec2bfc062de30e0e9571f77f5d11c7b9d..d0c7e58a3a00f0dccf46f00981a34af40b59d43c 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -592,15 +592,20 @@ sub render_dependent ($$$$$$$) {
        my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
        my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 
        my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
        my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 

-       my $mass_reason;
-       foreach my $p ("page.tmpl", keys %{$depends_simple{""}}) {
-               $mass_reason=$p if $rendered{$p};
+       foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
+               if ($rendered{$p}) {
+                       foreach my $f (@$files) {
+                               next if $rendered{$f};
+                               render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
+                       }
+                       return 0;
+               }

        }
         
        foreach my $f (@$files) {
                next if $rendered{$f};
                my $p=pagename($f);
        }
         
        foreach my $f (@$files) {
                next if $rendered{$f};
                my $p=pagename($f);

-               my $reason = $mass_reason;
+               my $reason = undef;

 
                if (exists $depends_simple{$p} && ! defined $reason) {
                        foreach my $d (keys %{$depends_simple{$p}}) {
 
                if (exists $depends_simple{$p} && ! defined $reason) {
                        foreach my $d (keys %{$depends_simple{$p}}) {