diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-23 19:42:15 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-23 19:42:15 +0200 |
| commit | 13a9bf472f548463682d4d3fafce146b9a9ced3c (patch) | |
| tree | 6587038defc1f9d6c8a032fdc25b9b4fb5787626 /system/core/CodeIgniter.php | |
| parent | 55a6ddb0c7bab1149bb1ddfa3a1aff46612c91d4 (diff) | |
| parent | 7d3399ead6857d5b2c7dd60165b85108e159ed7b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rwxr-xr-x | system/core/CodeIgniter.php | 11 |
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... * ------------------------------------------------------ */ |