| commit | 55450deee2acbdf112f5c206673b3215ca10dfcb | [log] [tgz] |
|---|---|---|
| author | Timothy Warren <tim@timshomepage.net> | Thu May 17 08:55:08 2012 -0400 |
| committer | Timothy Warren <tim@timshomepage.net> | Thu May 17 08:55:08 2012 -0400 |
| tree | 09fa0f810524ed353f868194059f336c6f26eb50 | |
| parent | 351c2e1b0d3fdca80a5483d708d7c71084226e68 [diff] | |
| parent | e30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c [diff] |
merge upstream
diff --git a/application/errors/error_404.php b/application/views/errors/error_404.php similarity index 100% rename from application/errors/error_404.php rename to application/views/errors/error_404.php
diff --git a/application/errors/error_db.php b/application/views/errors/error_db.php similarity index 100% rename from application/errors/error_db.php rename to application/views/errors/error_db.php
diff --git a/application/errors/error_general.php b/application/views/errors/error_general.php similarity index 100% rename from application/errors/error_general.php rename to application/views/errors/error_general.php
diff --git a/application/errors/error_php.php b/application/views/errors/error_php.php similarity index 100% rename from application/errors/error_php.php rename to application/views/errors/error_php.php
diff --git a/application/errors/index.html b/application/views/errors/index.html similarity index 100% rename from application/errors/index.html rename to application/views/errors/index.html
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 965a717..8c32085 100755 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php
@@ -143,7 +143,7 @@ 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 @@ 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/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst index e434e8d..63c4227 100644 --- a/user_guide_src/source/installation/upgrade_300.rst +++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -40,4 +40,9 @@ $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