summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:42:15 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:42:15 +0200
commit13a9bf472f548463682d4d3fafce146b9a9ced3c (patch)
tree6587038defc1f9d6c8a032fdc25b9b4fb5787626
parent55a6ddb0c7bab1149bb1ddfa3a1aff46612c91d4 (diff)
parent7d3399ead6857d5b2c7dd60165b85108e159ed7b (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
-rw-r--r--application/views/errors/error_404.php (renamed from application/errors/error_404.php)0
-rw-r--r--application/views/errors/error_db.php (renamed from application/errors/error_db.php)0
-rw-r--r--application/views/errors/error_general.php (renamed from application/errors/error_general.php)0
-rw-r--r--application/views/errors/error_php.php (renamed from application/errors/error_php.php)0
-rw-r--r--application/views/errors/index.html (renamed from application/errors/index.html)0
-rwxr-xr-xsystem/core/CodeIgniter.php11
-rwxr-xr-xsystem/core/Exceptions.php4
-rw-r--r--system/libraries/Cart.php2
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/installation/upgrade_300.rst7
10 files changed, 10 insertions, 15 deletions
diff --git a/application/errors/error_404.php b/application/views/errors/error_404.php
index c19bedfcd..c19bedfcd 100644
--- a/application/errors/error_404.php
+++ b/application/views/errors/error_404.php
diff --git a/application/errors/error_db.php b/application/views/errors/error_db.php
index 3b244e094..3b244e094 100644
--- a/application/errors/error_db.php
+++ b/application/views/errors/error_db.php
diff --git a/application/errors/error_general.php b/application/views/errors/error_general.php
index c88afe168..c88afe168 100644
--- a/application/errors/error_general.php
+++ b/application/views/errors/error_general.php
diff --git a/application/errors/error_php.php b/application/views/errors/error_php.php
index b76dc8a9e..b76dc8a9e 100644
--- a/application/errors/error_php.php
+++ b/application/views/errors/error_php.php
diff --git a/application/errors/index.html b/application/views/errors/index.html
index c942a79ce..c942a79ce 100644
--- a/application/errors/index.html
+++ b/application/views/errors/index.html
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
{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2b15c3f55..e0d745fd8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -37,6 +37,7 @@ Release Date: Not Released
Only entries in ``$autoload['libraries']`` are auto-loaded now.
- Added some more doctypes.
- Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
+ - Moved error templates to "application/views/errors"
- Helpers
diff --git a/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst
index e434e8d45..63c4227dc 100644
--- a/user_guide_src/source/installation/upgrade_300.rst
+++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -40,4 +40,9 @@ need to rename the `$active_record` variable to `$query_builder`.
$active_group = 'default';
// $active_record = TRUE;
- $query_builder = TRUE; \ No newline at end of file
+ $query_builder = TRUE;
+
+Step 5: Move your errors folder
+===============================
+
+In version 3.0.0, the errors folder has been moved from "application/errors" to "application/views/errors". \ No newline at end of file