Merge pull request #728 from Repox/develop
call_user_func_array() error with $this->db->call_function().
This fixes issue #725
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 4d76a55..97527e5 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -106,9 +106,13 @@
* Set a liberal script execution time limit
* ------------------------------------------------------
*/
- if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
+ if (function_exists("set_time_limit") AND @ini_get("safe_mode") == 0)
{
- @set_time_limit(300);
+ // Do not override the Time Limit value if running from Command Line
+ if(php_sapi_name() != 'cli')
+ {
+ @set_time_limit(300);
+ }
}
/*