remove redundant use

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 658d664af38d76b330ae9c27b74e77e5f28172a6..480e82804a3beb599df3969d788508dd550bccb6 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -93,7 +93,7 @@ sub check_content (@) {
                foreach my $line (split("\n", $params{content})) {
                        push @diff, $line if ! exists $old{$_};
                }
                foreach my $line (split("\n", $params{content})) {
                        push @diff, $line if ! exists $old{$_};
                }

-               $params{content}=join("\n", @diff);
+               $params{diff}=join("\n", @diff);

        }
 
        my $ok;
        }
 
        my $ok;


@@ -105,11 +105,12 @@ sub check_content (@) {
                                $ok=1;
                        }
                        elsif (ref $ret eq 'CODE') {
                                $ok=1;
                        }
                        elsif (ref $ret eq 'CODE') {

-                               $ret->();
+                               $ret->() unless $params{nonfatal};

                                $ok=0;
                        }
                        elsif (defined $ret) {
                                $ok=0;
                        }
                        elsif (defined $ret) {

-                               error($ret);
+                               error($ret) unless $params{nonfatal};
+                               $ok=0;

                        }
                }
 
                        }
                }
 


@@ -117,33 +118,6 @@ sub check_content (@) {
        return defined $ok ? $ok : 1;
 }
 
        return defined $ok ? $ok : 1;
 }
 

-sub check_cansave ($$$$) {
-       my $page=shift;
-       my $content=shift;
-       my $q=shift;
-       my $session=shift;
-
-       my $cansave;
-       run_hooks(cansave => sub {
-               return if defined $cansave;
-               my $ret=shift->($page, $content, $q, $session);
-               if (defined $ret) {
-                       if ($ret eq "") {
-                               $cansave=1;
-                       }
-                       elsif (ref $ret eq 'CODE') {
-                               $ret->();
-                               $cansave=0;
-                       }
-                       else {
-                               error($ret);
-                               $cansave=0;
-                       }
-               }
-       });
-       return $cansave;
-}
-

 sub cgi_editpage ($$) {
        my $q=shift;
        my $session=shift;
 sub cgi_editpage ($$) {
        my $q=shift;
        my $session=shift;


@@ -439,7 +413,6 @@ sub cgi_editpage ($$) {
                }
                
                my $content=$form->field('editcontent');
                }
                
                my $content=$form->field('editcontent');

-               check_cansave($page, $content, $q, $session);

                check_content(content => $content, page => $page,
                        cgi => $q, session => $session,
                        subject => $message);
                check_content(content => $content, page => $page,
                        cgi => $q, session => $session,
                        subject => $message);