X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f7b2cfcf50f12ad6ce7358f74e8db9d6083aa284..98f0d672dfcbc178b80a2d5f9a8b2f2633c8f039:/IkiWiki/Plugin/editpage.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index bba52e4fd..480e82804 100644
--- 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{$_};
 		}
-		$params{content}=join("\n", @diff);
+		$params{diff}=join("\n", @diff);
 	}
 
 	my $ok;
@@ -105,11 +105,12 @@ sub check_content (@) {
 				$ok=1;
 			}
 			elsif (ref $ret eq 'CODE') {
-				$ret->();
+				$ret->() unless $params{nonfatal};
 				$ok=0;
 			}
 			elsif (defined $ret) {
-				error($ret);
+				error($ret) unless $params{nonfatal};
+				$ok=0;
 			}
 		}