projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into po
[ikiwiki.git]
/
IkiWiki
/
Plugin
/
editpage.pm
diff --git
a/IkiWiki/Plugin/editpage.pm
b/IkiWiki/Plugin/editpage.pm
index cfed51afde08fa40461866f9e0f951b167d5b9f2..480e82804a3beb599df3969d788508dd550bccb6 100644
(file)
--- a/
IkiWiki/Plugin/editpage.pm
+++ b/
IkiWiki/Plugin/editpage.pm
@@
-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;
}
}