Skip to content

Commit 13a9bf4

Browse files
author
Phil Sturgeon
committed
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
2 parents 55a6ddb + 7d3399e commit 13a9bf4

File tree

10 files changed

+10
-15
lines changed

10 files changed

+10
-15
lines changed

‎application/errors/error_404.php renamed to ‎application/views/errors/error_404.php

File renamed without changes.

‎application/errors/error_db.php renamed to ‎application/views/errors/error_db.php

File renamed without changes.

‎application/errors/error_general.php renamed to ‎application/views/errors/error_general.php

File renamed without changes.

‎application/errors/error_php.php renamed to ‎application/views/errors/error_php.php

File renamed without changes.

‎application/errors/index.html renamed to ‎application/views/errors/index.html

File renamed without changes.

‎system/core/CodeIgniter.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,6 @@
9999
get_config(array('subclass_prefix' => $assign_to_config['subclass_prefix']));
100100
}
101101

102-
/*
103-
* ------------------------------------------------------
104-
* Set a liberal script execution time limit
105-
* ------------------------------------------------------
106-
*/
107-
if (function_exists('set_time_limit') && @ini_get('safe_mode') == 0
108-
&& php_sapi_name() !== 'cli') // Do not override the Time Limit value if running from Command Line
109-
{
110-
@set_time_limit(300);
111-
}
112-
113102
/*
114103
* ------------------------------------------------------
115104
* Start the timer... tick tock tick tock...

‎system/core/Exceptions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function show_error($heading, $message, $template = 'error_general', $sta
143143
ob_end_flush();
144144
}
145145
ob_start();
146-
include(APPPATH.'errors/'.$template.'.php');
146+
include(APPPATH.'views/errors/'.$template.'.php');
147147
$buffer = ob_get_contents();
148148
ob_end_clean();
149149
return $buffer;
@@ -177,7 +177,7 @@ public function show_php_error($severity, $message, $filepath, $line)
177177
ob_end_flush();
178178
}
179179
ob_start();
180-
include(APPPATH.'errors/error_php.php');
180+
include(APPPATH.'views/errors/error_php.php');
181181
$buffer = ob_get_contents();
182182
ob_end_clean();
183183
echo $buffer;

‎system/libraries/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ protected function _insert($items = array())
245245
// This becomes the unique "row ID"
246246
if (isset($items['options']) && count($items['options']) > 0)
247247
{
248-
$rowid = md5($items['id'].implode('', $items['options']));
248+
$rowid = md5($items['id'].serialize($items['options']));
249249
}
250250
else
251251
{

‎user_guide_src/source/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Release Date: Not Released
3737
Only entries in ``$autoload['libraries']`` are auto-loaded now.
3838
- Added some more doctypes.
3939
- Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
40+
- Moved error templates to "application/views/errors"
4041

4142
- Helpers
4243

‎user_guide_src/source/installation/upgrade_300.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@ need to rename the `$active_record` variable to `$query_builder`.
4040

4141
$active_group = 'default';
4242
// $active_record = TRUE;
43-
$query_builder = TRUE;
43+
$query_builder = TRUE;
44+
45+
Step 5: Move your errors folder
46+
===============================
47+
48+
In version 3.0.0, the errors folder has been moved from "application/errors" to "application/views/errors".

0 commit comments

Comments
 (0)