summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authortomekp <tomekp@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-04 12:47:45 +0000
committertomekp <tomekp@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-04 12:47:45 +0000
commitee73a5da28a3a33f0e83e6192b531eeb0efe6b2b (patch)
treef43d7f12e9657c6dc8496f6e2edd36983e594a77 /roundcubemail
parent3e331a8d90bb48c251183d40c51b00a55f02ba8c (diff)
check if safe mode is on or not
git-svn-id: https://svn.roundcube.net/trunk@502 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/CHANGELOG3
-rw-r--r--roundcubemail/index.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 4988b49c1..7b2597edf 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,9 @@
CHANGELOG RoundCube Webmail
---------------------------
+2007/03/04 (tomekp)
+- check if safe mode is on or not (closes #1484269)
+
2007/03/02 (thomasb)
----------
- Show "no subject" in message list if subject is missing (closes #1484243)
diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index 458a11361..8219be46e 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/index.php
@@ -73,7 +73,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
// increase maximum execution time for php scripts
// (does not work in safe mode)
-@set_time_limit(120);
+if (!ini_get('safe_mode')) @set_time_limit(120);
// include base files
require_once('include/rcube_shared.inc');