Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Plugin / version.pm

diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 0e8d7b5e71a03d3844e15c0b28540fcfb2794487..18e9613aee76fd51e04681128af8646dab916963 100644 (file)
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -7,16 +7,33 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "version", call => \&getsetup);

        hook(type => "needsbuild", id => "version", call => \&needsbuild);
        hook(type => "preprocess", id => "version", call => \&preprocess);
 } # }}}
 
        hook(type => "needsbuild", id => "version", call => \&needsbuild);
        hook(type => "preprocess", id => "version", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {

-               if (exists $pagestate{$page}{version}{shown} &&
-                   $pagestate{$page}{version}{shown} ne $IkiWiki::version) {
-                       push @$needsbuild, $pagesources{$page};
+               if (exists $pagestate{$page}{version}{shown}) {
+                       if ($pagestate{$page}{version}{shown} ne $IkiWiki::version) {
+                               push @$needsbuild, $pagesources{$page};
+                       }
+                       if (exists $pagesources{$page} &&
+                           grep { $_ eq $pagesources{$page} } @$needsbuild) {
+                               # remove state, will be re-added if
+                               # the version is still shown during the
+                               # rebuild
+                               delete $pagestate{$page}{version}{shown};
+                       }

                }
        }
 } # }}}
                }
        }
 } # }}}