diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/application/config/autoload.php | 27 | ||||
| -rw-r--r-- | system/libraries/Controller.php | 12 |
2 files changed, 26 insertions, 13 deletions
diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 1ed6f1757..4efe3be41 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -10,8 +10,7 @@ | the database is not connected to automatically since no assumption | is made regarding whether you intend to use it. This file lets | you globally define which systems you would like loaded with every -| request. In addition to core systems you can auto-load plugins, -| helper files, config files, and your own scripts. +| request. | | ------------------------------------------------------------------- | Instructions @@ -19,27 +18,27 @@ | | These are the things you can load automatically: | -| 1. Core classes +| 1. Libraries | 2. Helper files | 3. Plugins | 4. Scripts | 5. Custom config files | -| Note: The items will be loaded in the order that they are defined -| -| Please read the user guide for more detailed information */ /* | ------------------------------------------------------------------- -| Auto-load Core Classes +| Auto-load Libraries | ------------------------------------------------------------------- +| These are the classes located in the system/libraries folder +| or in your system/application/libraries folder. +| | Prototype: | -| $autoload['core'] = array('database', 'session', 'xmlrpc'); +| $autoload['libraries'] = array('database', 'session', 'xmlrpc'); */ -$autoload['core'] = array(); +$autoload['libraries'] = array(); /* @@ -97,5 +96,15 @@ $autoload['script'] = array(); $autoload['config'] = array(); +/* +| ------------------------------------------------------------------- +| Auto-load Core Libraries +| ------------------------------------------------------------------- +| +| DEPRECATED: Use $autoload $autoload['libraries'] instead. +| +*/ +// $autoload['core'] = array(); + ?>
\ No newline at end of file diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 768b154e8..5a32e65c0 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -232,16 +232,20 @@ class Controller extends CI_Base { } unset($autoload['config']); - if ( ! is_array($autoload['core'])) + // A little tweak to remain backward compatible + // The $autoload['core'] item was deprecated + if ( ! isset($autoload['libraries'])) { - $autoload['core'] = array($autoload['core']); + $autoload['libraries'] = $autoload['core']; + } - foreach ($autoload['core'] as $item) + foreach ($autoload['libraries'] as $item) { $this->_ci_initialize($item); } - + unset($autoload['libraries']); + return $autoload; } // END _ci_autoload() |