summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xikiwiki5
1 files changed, 3 insertions, 2 deletions
diff --git a/ikiwiki b/ikiwiki
index f918980dd..e218979d1 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -420,7 +420,7 @@ sub lockwiki () { #{{{
}
} #}}}
-sub lockwiki () { #{{{
+sub unlockwiki () { #{{{
close WIKILOCK;
} #}}}
@@ -1134,7 +1134,8 @@ sub cgi_editpage ($$) { #{{{
# presumably the commit will trigger an update
# of the wiki
rcs_commit($message);
- unlock_wiki();
+ # prevent deadlock with post-commit hook
+ unlockwiki();
}
else {
loadindex();