diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2010-02-15 21:04:13 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-02-15 21:04:13 +0100 |
| commit | 544ed901ab29fc8b73d559c5cc89b7c57f643fc5 (patch) | |
| tree | 7472aae7c55d6befd9d5a893a8907f55d52314d9 | |
| parent | a1a523400d0d60d4009f551a86a4bd34efcd15af (diff) | |
| download | rpg-544ed901ab29fc8b73d559c5cc89b7c57f643fc5.tar.gz rpg-544ed901ab29fc8b73d559c5cc89b7c57f643fc5.tar.bz2 | |
Disable locking when locktime is zero
| -rw-r--r-- | inc/common.php | 6 | ||||
| -rw-r--r-- | lib/exe/js.php | 4 |
2 files changed, 9 insertions, 1 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']); 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()'); |