From 544ed901ab29fc8b73d559c5cc89b7c57f643fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Mon, 15 Feb 2010 21:04:13 +0100
Subject: [PATCH] Disable locking when locktime is zero
---
inc/common.php | 6 ++++++
lib/exe/js.php | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
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']);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 8648bf18f..5d93a69a4 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -113,7 +113,9 @@ function js_out(){
js_runonstart("initSizeCtl('size__ctl','wiki__text')");
js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
js_runonstart("initChangeCheck('".js_escape($lang['notsavedyet'])."')");
- js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")");
+ if($conf['locktime'] != 0){
+ js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")");
+ }
js_runonstart('scrollToMarker()');
js_runonstart('focusMarker()');
--
GitLab