Merge remote branch 'remotes/peteg/revert' into revert

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 79d175328fbd775f696c0c2812e77924a335ae63..9a62cb2437b52abe15b60b65b7005c6df187cbd9 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -92,8 +92,7 @@ sub sessioncgi ($$) {
 
     return unless $do eq 'revert' && $rev;
 
-    # FIXME rcs_preprevert ??
-    IkiWiki::check_canedit('FIXME', $q, $session);
+    IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev);
 
     my ($form, $buttons) = confirmation_form($q, $session);
     IkiWiki::decode_form_utf8($form);
@@ -108,16 +107,15 @@ sub sessioncgi ($$) {
         IkiWiki::enable_commit_hook();
 
         if($r) {
-            die "FIXME revert '$rev' failed.";
+            die "Revert '$rev' failed.";
         } else {
             require IkiWiki::Render;
             IkiWiki::refresh();
             IkiWiki::saveindex();
-            # FIXME indicate success.
         }
     } else {
         $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
-        my $patch_contents = IkiWiki::rcs_showpatch($rev);
+        my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev);
         $form->tmpl_param(patch_contents => encode_entities($patch_contents));
         $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
         IkiWiki::showform($form, $buttons, $session, $q);