summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-24 15:02:54 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-24 15:02:54 -0400
commit739e2ca0b442531b3f0e1b83c3338d2da65ca77d (patch)
treeb8c197a99af1590e48f691c4cd30d52b46bb02a6
parent6422e460404be188999e7a1710bc0a20534e0c9d (diff)
can't lock wiki due to permissions (probably)
luckily, don't really need to here
-rw-r--r--IkiWiki/Receive.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 9a672abc9..81b67d9b4 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -33,7 +33,8 @@ sub test () { #{{{
$session->param("name", getuser());
$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
- IkiWiki::lockwiki();
+ # Wiki is not locked because we lack permission to do so.
+ # So, relying on atomic index file updates to avoid trouble.
IkiWiki::loadindex();
my %newfiles;
@@ -59,8 +60,8 @@ sub test () { #{{{
$change->{action} eq 'add') {
if (defined $page) {
if (IkiWiki->can("check_canedit")) {
- IkiWiki::check_canedit($page, $cgi, $session);
- next;
+ IkiWiki::check_canedit($page, $cgi, $session);
+ next;
}
}
else {