Merge branch 'ready/postform-no'

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

diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 0e8d7b5e71a03d3844e15c0b28540fcfb2794487..fc265526c15e41682efec8c7702d3a54e5efcf17 100644 (file)
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -4,26 +4,45 @@ package IkiWiki::Plugin::version;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "version", call => \&getsetup);
        hook(type => "needsbuild", id => "version", call => \&needsbuild);
        hook(type => "preprocess", id => "version", call => \&preprocess);
-} # }}}
+}
 
-sub needsbuild (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+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};
+                       }
                }
        }
-} # }}}
+       return $needsbuild;
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
        my %params=@_;
        $pagestate{$params{destpage}}{version}{shown}=$IkiWiki::version;
-} # }}}
+}
 
 1