1 files changed, 6 insertions, 0 deletions
diff --git a/inc/common.php b/inc/common.php
index 64c1b0a41..c5ad92dc5 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -732,6 +732,12 @@ function checklock($id){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function lock($id){
+    global $conf;
+
+    if($conf['locktime'] == 0){
+        return;
+    }
+
     $lock = wikiLockFN($id);
     if($_SERVER['REMOTE_USER']){
         io_saveFile($lock,$_SERVER['REMOTE_USER']);