Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom <id>.

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

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 46eb1168edddd42b6086b646ae48d63cb7dd2111..9872e9686c2a3255d638968002a5d6339c1d20e2 100644 (file)
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -25,7 +25,7 @@ sub diff ($$) { #{{{
 
        print DIFFIN $content;
        close DIFFIN;
 
        print DIFFIN $content;
        close DIFFIN;

-       my $ret;
+       my $ret='';

        while (<DIFFOUT>) {
                if (defined $ret) {
                        $ret.=$_;
        while (<DIFFOUT>) {
                if (defined $ret) {
                        $ret.=$_;


@@ -46,12 +46,11 @@ sub diff ($$) { #{{{
 sub formbuilder_setup { #{{{
        my %params=@_;
        my $form=$params{form};
 sub formbuilder_setup { #{{{
        my %params=@_;
        my $form=$params{form};

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

 
 

-       return if $form->title ne "editpage"
-                 || $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";