diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-24 14:22:31 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-24 14:22:31 +0200 |
| commit | 04f9fcb4da8c227cd7604973a02f57760fca2683 (patch) | |
| tree | 543faa5b62378e0a6120390e6689539a78683a3d | |
| parent | 190d88f3e0a65e52534dc3e09438fe4d9673bf11 (diff) | |
| parent | e77c6117e473900ca35ec7993f4159179d5b5f9c (diff) | |
Merge pull request #270 from bubbafoley/extend-autoloader
make _ci_autoloader() protected so it can be properly extended.
| -rwxr-xr-x | system/core/Loader.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 452dc0b4c..de0fc06d2 100755 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1106,7 +1106,7 @@ class CI_Loader { * @param array * @return void */ - private function _ci_autoloader() + protected function _ci_autoloader() { if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4c207d6bc..5842fa000 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,7 @@ Change Log <li class="reactor">Added a <a href="libraries/migration.html">Migration Library</a> to assist with applying incremental updates to your database schema.</li> <li class="reactor">Driver children can be located in any package path.</li> <li class="reactor">Added max_filename_increment config setting for Upload library.</li> + <li><samp>CI_Loader::_ci_autoloader()</samp> is now a protected method.</li> </ul> </li> </ul> |