diff options
author | Eric Roberts <eric@cryode.com> | 2013-01-12 04:21:25 +0100 |
---|---|---|
committer | Eric Roberts <eric@cryode.com> | 2013-01-12 04:21:25 +0100 |
commit | 7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (patch) | |
tree | 9fb1452b99805eaf655b8760f18ece663c160783 /user_guide_src | |
parent | c90e67ea553f1ff0fc22f280583fca22f95f9f42 (diff) | |
parent | 5a519db2c4884a3972dd33e09d0b3a314aa222e2 (diff) |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'user_guide_src')
-rw-r--r-- | user_guide_src/source/changelog.rst | 1 | ||||
-rw-r--r-- | user_guide_src/source/general/autoloader.rst | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2966f659f..989999929 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -285,6 +285,7 @@ Release Date: Not Released - Added autoloading of drivers with ``$autoload['drivers']``. - ``$config['rewrite_short_tags']`` now has no effect when using PHP 5.4 as ``<?=`` will always be available. - Changed method ``config()`` to return whatever ``CI_Config::load()`` returns instead of always being void. + - Added support for model aliasing on autoload. - :doc:`Input Library <libraries/input>` changes include: - Added ``method()`` to retrieve ``$_SERVER['REQUEST_METHOD']``. - Added support for arrays and network addresses (e.g. 192.168.1.1/24) for use with the *proxy_ips* setting. diff --git a/user_guide_src/source/general/autoloader.rst b/user_guide_src/source/general/autoloader.rst index e5cec723b..bf2e3935a 100644 --- a/user_guide_src/source/general/autoloader.rst +++ b/user_guide_src/source/general/autoloader.rst @@ -15,7 +15,7 @@ The following items can be loaded automatically: - Language files found in the *system/language/* directory - Models found in the *models/* folder -To autoload resources, open the *application/config/autoload.php* +To autoload resources, open the **application/config/autoload.php** file and add the item you want loaded to the autoload array. You'll find instructions in that file corresponding to each type of item. |