diff options
| -rw-r--r-- | system/core/Common.php | 2 | ||||
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/errors.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/general/managing_apps.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/routing.rst | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 10c22375e..efa7a9380 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -359,7 +359,7 @@ if ( ! function_exists('show_error')) * * This function lets us invoke the exception class and * display errors using the standard error template located - * in application/errors/errors.php + * in application/views/errors/error_general.php * This function will send the error page directly to the * browser and exit. * diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index bbefbe566..97021f125 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1609,7 +1609,7 @@ abstract class CI_DB_driver { * @param string the error message * @param string any "swap" values * @param bool whether to localize the message - * @return string sends the application/error_db.php template + * @return string sends the application/views/errors/error_db.php template */ public function display_error($error = '', $swap = '', $native = FALSE) { diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 441cedb80..a247c1b9f 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -42,7 +42,7 @@ show_error() This function will display the error message supplied to it using the following error template:: - application/errors/error_general.php + application/views/errors/error_general.php The optional parameter ``$status_code`` determines what HTTP status code should be sent with the error. If ``$status_code`` is less than 100, @@ -64,7 +64,7 @@ show_404() This function will display the 404 error message supplied to it using the following error template:: - application/errors/error_404.php + application/views/errors/error_404.php The function expects the string passed to it to be the file path to the page that isn't found. The exit status code will be set to ``EXIT_UNKNOWN_FILE``. diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst index afb1aba2e..3ca0e03a7 100644 --- a/user_guide_src/source/general/managing_apps.rst +++ b/user_guide_src/source/general/managing_apps.rst @@ -21,7 +21,7 @@ Relocating your Application Directory ===================================== It is possible to move your application directory to a different -location on your server than your system directory. To do so open +location on your server than your web root. To do so open your main index.php and set a *full server path* in the ``$application_folder`` variable:: diff --git a/user_guide_src/source/general/routing.rst b/user_guide_src/source/general/routing.rst index 0c6dfe888..123257fc8 100644 --- a/user_guide_src/source/general/routing.rst +++ b/user_guide_src/source/general/routing.rst @@ -163,7 +163,7 @@ This route indicates which controller class should be loaded if the requested controller is not found. It will override the default 404 error page. It won't affect to the ``show_404()`` function, which will continue loading the default *error_404.php* file at -*application/errors/error_404.php*. +*application/views/errors/error_404.php*. .. important:: The reserved routes must come before any wildcard or regular expression routes.
\ No newline at end of file |