diff options
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Receive.pm | 18 | ||||
| -rw-r--r-- | doc/plugins/pingee.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/xma/discussion.mdwn | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index e565f6369..3a8476e7d 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -619,7 +619,7 @@ sub rcs_receive () { #{{{ # Avoid chdir when running git here, because the changes # are in the master git repo, not the srcdir repo. - # The pre-recieve hook already puts us in the right place. + # The pre-receive hook already puts us in the right place. $no_chdir=1; my @changes=git_commit_info($oldrev."..".$newrev); $no_chdir=0; diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 33f548a14..c69911a7c 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -58,15 +58,15 @@ sub test () { #{{{ if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - if (IkiWiki->can("check_canedit") && - IkiWiki::check_canedit($page, $cgi, $session)) { - next; + if (IkiWiki->can("check_canedit")) { + IkiWiki::check_canedit($page, $cgi, $session); + next; } } else { - if (IkiWiki::Plugin::attachment->can("check_canattach") && - IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) { - next; + if (IkiWiki::Plugin::attachment->can("check_canattach")) { + IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); + next; } } } @@ -80,15 +80,15 @@ sub test () { #{{{ # could add.) next if $newfiles{$file}; - if (IkiWiki::Plugin::remove->can("check_canremove") && - IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) { + if (IkiWiki::Plugin::remove->can("check_canremove")) { + IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); next; } } else { error "unknown action ".$change->{action}; } - + error sprintf(gettext("you are not allowed to change %s"), $file); } diff --git a/doc/plugins/pingee.mdwn b/doc/plugins/pingee.mdwn index d012004f9..6156c235f 100644 --- a/doc/plugins/pingee.mdwn +++ b/doc/plugins/pingee.mdwn @@ -3,7 +3,7 @@ This plugin causes ikiwiki to listen for pings, typically delivered from another ikiwiki instance using the [[pinger]] plugin. When a ping is -recieved, ikiwiki will update the wiki, the same as if `ikiwiki --refresh` +received, ikiwiki will update the wiki, the same as if `ikiwiki --refresh` were ran at the command line. An url such as the following is used to trigger a ping: diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn index c2bb62062..34adbf821 100644 --- a/doc/users/xma/discussion.mdwn +++ b/doc/users/xma/discussion.mdwn @@ -14,3 +14,5 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there > for ikiwiki. --[[Joey]] > > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]] + +>>>> Now developed! --[[Joey]] |