Merge pull request bcit-ci#1367 from PawelDecowski/develop

Phil Sturgeon · Phil Sturgeon · commit 82741441c22c · 2012-05-23T10:24:14.000-07:00
Remove set_time_limit() call. Fixes bcit-ci#1346
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
@@ -99,17 +99,6 @@
 		get_config(array('subclass_prefix' => $assign_to_config['subclass_prefix']));
 	}
 
-/*
- * ------------------------------------------------------
- *  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...
