aggregrate: Fix several bugs in handling of empty and colliding titles when generatin...

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

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index b8ecaa3d747c356e1690c197592eaecfd44c1456..015ce9c148d554c29a3db6a04227a2a50c88f02e 100644 (file)
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -4,16 +4,26 @@ package IkiWiki::Plugin::editdiff;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use HTML::Entities;
 use IPC::Open2;
 
 use HTML::Entities;
 use IPC::Open2;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "editdiff", call => \&getsetup);

        hook(type => "formbuilder_setup", id => "editdiff",
                call => \&formbuilder_setup);
        hook(type => "formbuilder_setup", id => "editdiff",
                call => \&formbuilder_setup);

-} #}}}
+}

 
 

-sub diff ($$) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+                       section => "web",
+               },
+}
+
+sub diff ($$) {

        my $orig=shift;
        my $content=shift;
 
        my $orig=shift;
        my $content=shift;
 


@@ -41,16 +51,16 @@ sub diff ($$) { #{{{
        return "couldn't run diff\n" if $sigpipe;
 
        return "<pre>".encode_entities($ret)."</pre>";
        return "couldn't run diff\n" if $sigpipe;
 
        return "<pre>".encode_entities($ret)."</pre>";

-} #}}}
+}

 
 

-sub formbuilder_setup { #{{{
+sub formbuilder_setup {

        my %params=@_;
        my $form=$params{form};
        my %params=@_;
        my $form=$params{form};

-       my $page=$form->field("page");

 
 

-       return if $form->field("do") ne "edit";
+       return if ! defined $form->field("do") || $form->field("do") ne "edit";

 
 

-       $page = IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($page));
+       my $page=$form->field("page");
+       $page = IkiWiki::possibly_foolish_untaint($page);

        return unless exists $pagesources{$page};
 
        push @{$params{buttons}}, "Diff";
        return unless exists $pagesources{$page};
 
        push @{$params{buttons}}, "Diff";


@@ -61,8 +71,8 @@ sub formbuilder_setup { #{{{
                $content=~s/\r/\n/g;
 
                my $diff = diff(srcfile($pagesources{$page}), $content);
                $content=~s/\r/\n/g;
 
                my $diff = diff(srcfile($pagesources{$page}), $content);

-               $form->tmpl_param("page_preview", $diff);
+               $form->tmpl_param("page_diff", $diff);

        }
        }

-} #}}}
+}

 
 1
 
 1