summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 19:03:26 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 19:03:26 +0100
commitf566af5ffb8f2e8d49bd0b206c6ee29c8bc35a78 (patch)
tree72cd58fb711f34aa145820e0b195b755a6ba7fb8 /system/core
parente917f9be8b05c81357c1c2c9730d5060685d644d (diff)
Fixed a bug where silently failed to override if set_time_limit was in Suhosin's function blacklist. Simply moved the set_time_limit call down a bit.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/CodeIgniter.php16
1 files changed, 10 insertions, 6 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index f67bb8c10..e701cc323 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -67,12 +67,6 @@
@set_magic_quotes_runtime(0); // Kill magic quotes
}
- // Set a liberal script execution time limit
- if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
- {
- @set_time_limit(300);
- }
-
/*
* ------------------------------------------------------
* Set the subclass_prefix
@@ -93,6 +87,16 @@
{
get_config(array('subclass_prefix' => $assign_to_config['subclass_prefix']));
}
+
+/*
+ * ------------------------------------------------------
+ * Set a liberal script execution time limit
+ * ------------------------------------------------------
+ */
+ if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
+ {
+ @set_time_limit(300);
+ }
/*
* ------------------------------------------------------