summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst7
-rw-r--r--user_guide_src/source/general/common_functions.rst2
-rw-r--r--user_guide_src/source/general/errors.rst4
-rw-r--r--user_guide_src/source/general/managing_apps.rst2
-rw-r--r--user_guide_src/source/general/reserved_names.rst18
-rw-r--r--user_guide_src/source/general/routing.rst2
-rw-r--r--user_guide_src/source/general/security.rst3
-rw-r--r--user_guide_src/source/libraries/email.rst2
8 files changed, 30 insertions, 10 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 07dae1fdc..21d0bde63 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -304,6 +304,7 @@ Release Date: Not Released
- Changed method ``valid_ip()`` to use PHP's native ``filter_var()`` function.
- Changed internal method ``_sanitize_globals()`` to skip enforcing reversal of *register_globals* in PHP 5.4+, where this functionality no longer exists.
- Changed methods ``get()``, ``post()``, ``get_post()``, ``cookie()``, ``server()``, ``user_agent()`` to return NULL instead of FALSE when no value is found.
+ - Changed method ``_fetch_from_array()`` to parse array notation in field name.
- :doc:`Common functions <general/common_functions>` changes include:
- Added function :php:func:`get_mimes()` to return the *application/config/mimes.php* array.
- Added support for HTTP code 303 ("See Other") in :php:func:`set_status_header()`.
@@ -481,13 +482,15 @@ Bug fixes for 3.0
- Fixed a bug (#113) - :doc:`Form Validation Library <libraries/form_validation>` didn't properly handle empty fields that were specified as an array.
- Fixed a bug (#2061) - :doc:`Routing Class <general/routing>` didn't properly sanitize directory, controller and function triggers with **enable_query_strings** set to TRUE.
- Fixed a bug - SQLSRV didn't support ``escape_like_str()`` or escaping an array of values.
-- Fixed a bug - :doc:`DB result <database/results>` method ``list_fields()`` didn't reset its field pointer for the *mysql*, *mysqli* and *mssql* drivers.
+- Fixed a bug - :doc:`Database Results <database/results>` method ``list_fields()`` didn't reset its field pointer for the *mysql*, *mysqli* and *mssql* drivers.
- Fixed a bug (#73) - :doc:`Security Library <libraries/security>` method ``sanitize_filename()`` could be tricked by an XSS attack.
- Fixed a bug (#2211) - :doc:`Migration Library <libraries/migration>` extensions couldn't execute ``CI_Migration::__construct()``.
-- Fixed a bug (#2255) - :doc:`Email Library <libraries/email>` didn't apply ``smtp_timeout``to socket reads and writes.
+- Fixed a bug (#2255) - :doc:`Email Library <libraries/email>` didn't apply ``smtp_timeout`` to socket reads and writes.
- Fixed a bug (#2239) - :doc:`Email Library <libraries/email>` improperly handled the Subject when used with ``bcc_batch_mode`` resulting in E_WARNING messages and an empty Subject.
- Fixed a bug (#2234) - :doc:`Query Builder <database/query_builder>` didn't reset JOIN cache for write-type queries.
- Fixed a bug (#2298) - :doc:`Database Results <database/results>` method `next_row()` kept returning the last row, allowing for infinite loops.
+- Fixed a bug (#2236) - :doc:`Form Helper <helpers/form_helper>` function ``set_value()`` didn't parse array notation for keys if the rule was not present in the :doc:`Form Validation Library <libraries/form_validation>`.
+- Fixed a bug (#2353) - :doc:`Query Builder <database/query_builder>` erroneously prefixed literal strings with **dbprefix**.
Version 2.1.3
=============
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 7917d3239..79bd9b459 100644
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -31,7 +31,7 @@ version of PHP is lower than the supplied version number.
is_really_writable()
====================
-.. php:function:: is_really_writeable($file)
+.. php:function:: is_really_writable($file)
:param string $file: File path
:returns: bool
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/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst
index d91292363..ccc17d61b 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -25,15 +25,21 @@ your controller any of these:
Functions
---------
+- :php:func:`is_php()`
- :php:func:`is_really_writable()`
- ``load_class()``
+- ``is_loaded()``
- ``get_config()``
- :php:func:`config_item()`
- :php:func:`show_error()`
- :php:func:`show_404()`
- :php:func:`log_message()`
+- :php:func:`set_status_header()`
- :php:func:`get_mimes()`
- :php:func:`html_escape()`
+- :php:func:`remove_invisible_characters()`
+- :php:func:`is_https()`
+- :php:func:`function_usable()`
- :php:func:`get_instance()`
- ``_exception_handler()``
- ``_stringify_attributes()``
@@ -66,4 +72,14 @@ Constants
- FOPEN_WRITE_CREATE
- FOPEN_READ_WRITE_CREATE
- FOPEN_WRITE_CREATE_STRICT
-- FOPEN_READ_WRITE_CREATE_STRICT \ No newline at end of file
+- FOPEN_READ_WRITE_CREATE_STRICT
+- EXIT_SUCCESS
+- EXIT_ERROR
+- EXIT_CONFIG
+- EXIT_UNKNOWN_FILE
+- EXIT_UNKNOWN_CLASS
+- EXIT_UNKNOWN_METHOD
+- EXIT_USER_INPUT
+- EXIT_DATABASE
+- EXIT__AUTO_MIN
+- EXIT__AUTO_MAX \ No newline at end of file
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
diff --git a/user_guide_src/source/general/security.rst b/user_guide_src/source/general/security.rst
index 984ca840b..3f93443bb 100644
--- a/user_guide_src/source/general/security.rst
+++ b/user_guide_src/source/general/security.rst
@@ -15,11 +15,12 @@ the following:
- Alpha-numeric text (latin characters only)
- Tilde: ~
+- Percent sign: %
- Period: .
- Colon: :
- Underscore: \_
- Dash: -
-- Pipe: |
+- Space
Register_globals
=================
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index a55f1895d..39629ece1 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -43,7 +43,7 @@ This example assumes you are sending the email from one of your
Setting Email Preferences
=========================
-There are 17 different preferences available to tailor how your email
+There are 21 different preferences available to tailor how your email
messages are sent. You can either set them manually as described here,
or automatically via preferences stored in your config file, described
below: