summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/config/config.php4
-rw-r--r--system/core/Exceptions.php4
-rw-r--r--user_guide_src/source/changelog.rst2
3 files changed, 5 insertions, 5 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 069162097..85d8da08a 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -255,14 +255,14 @@ $config['log_date_format'] = 'Y-m-d H:i:s';
/*
|--------------------------------------------------------------------------
-| Error Templates Directory Path
+| Error Views Directory Path
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
| application/views/errors/ folder. Use a full server path with trailing slash.
|
*/
-$config['error_templates_path'] = '';
+$config['error_views_path'] = '';
/*
|--------------------------------------------------------------------------
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index 398459d54..0c247f916 100644
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -83,8 +83,8 @@ class CI_Exceptions {
$config =& get_config();
- $this->_templates_path = (isset($config['error_templates_path']) && $config['error_templates_path'] !== '')
- ? $config['error_templates_path']
+ $this->_templates_path = (isset($config['error_views_path']) && $config['error_views_path'] !== '')
+ ? $config['error_views_path']
: VIEWPATH.'errors'.DIRECTORY_SEPARATOR;
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5cee05bba..a4669773f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -49,7 +49,7 @@ Release Date: Not Released
- 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/*.
- Added support non-HTML error templates for CLI applications.
- - Made error templates path configurable using ``$config['error_templates_path']``.
+ - Made error templates path configurable using ``$config['error_views_path']``.
- Moved the Log class to *application/core/*
- Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per environment.
- Changed detection of ``$view_folder`` so that if it's not found in the current path, it will now also be searched for under the application folder.