summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-24 13:55:45 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-24 13:55:45 +0200
commit6763522d29416b7db90a6d3c5dceffe1536d8efe (patch)
treea8694c530b4467f496eeeba5fcd25c08654d4919 /system/core/CodeIgniter.php
parentae9475557c1968826aee0fa5554899c8329412c2 (diff)
parent13a9bf472f548463682d4d3fafce146b9a9ced3c (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/core/CodeIgniter.php')
-rwxr-xr-xsystem/core/CodeIgniter.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 585bb7b31..c8245fcfa 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -101,17 +101,6 @@
/*
* ------------------------------------------------------
- * Set a liberal script execution time limit
- * ------------------------------------------------------
- */
- if (function_exists('set_time_limit') && @ini_get('safe_mode') == 0
- && php_sapi_name() !== 'cli') // Do not override the Time Limit value if running from Command Line
- {
- @set_time_limit(300);
- }
-
-/*
- * ------------------------------------------------------
* Start the timer... tick tock tick tock...
* ------------------------------------------------------
*/