summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2010-02-15 21:04:13 +0100
committerAndreas Gohr <andi@splitbrain.org>2010-02-15 21:04:13 +0100
commit544ed901ab29fc8b73d559c5cc89b7c57f643fc5 (patch)
tree7472aae7c55d6befd9d5a893a8907f55d52314d9 /lib/exe
parenta1a523400d0d60d4009f551a86a4bd34efcd15af (diff)
downloadrpg-544ed901ab29fc8b73d559c5cc89b7c57f643fc5.tar.gz
rpg-544ed901ab29fc8b73d559c5cc89b7c57f643fc5.tar.bz2
Disable locking when locktime is zero
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/js.php4
1 files changed, 3 insertions, 1 deletions
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()');