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 | |
| parent | 55a6ddb0c7bab1149bb1ddfa3a1aff46612c91d4 (diff) | |
| parent | 7d3399ead6857d5b2c7dd60165b85108e159ed7b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system')
| -rwxr-xr-x | system/core/CodeIgniter.php | 11 | ||||
| -rwxr-xr-x | system/core/Exceptions.php | 4 | ||||
| -rw-r--r-- | system/libraries/Cart.php | 2 |
3 files changed, 3 insertions, 14 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... * ------------------------------------------------------ */ diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 965a717ad..8c32085fe 100755 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -143,7 +143,7 @@ class CI_Exceptions { ob_end_flush(); } ob_start(); - include(APPPATH.'errors/'.$template.'.php'); + include(APPPATH.'views/errors/'.$template.'.php'); $buffer = ob_get_contents(); ob_end_clean(); return $buffer; @@ -177,7 +177,7 @@ class CI_Exceptions { ob_end_flush(); } ob_start(); - include(APPPATH.'errors/error_php.php'); + include(APPPATH.'views/errors/error_php.php'); $buffer = ob_get_contents(); ob_end_clean(); echo $buffer; diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index b73ed5128..827050310 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -245,7 +245,7 @@ class CI_Cart { // This becomes the unique "row ID" if (isset($items['options']) && count($items['options']) > 0) { - $rowid = md5($items['id'].implode('', $items['options'])); + $rowid = md5($items['id'].serialize($items['options'])); } else { |