Skip to content

Commit 3046c9f

Browse files
author
Phil Sturgeon
committed
Merge pull request bcit-ci#1357 from timw4mail/errors
Move errors to views folder
2 parents 3729477 + 2fceb85 commit 3046c9f

File tree

8 files changed

+9
-3
lines changed

8 files changed

+9
-3
lines changed
File renamed without changes.

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;

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)