2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4988b49c1..7b2597edf 100644
--- a/CHANGELOG
+++ b/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/index.php b/index.php
index 458a11361..8219be46e 100644
--- a/index.php
+++ b/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');