diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
| commit | f00191c02985fba1e360a22ad914c547696df1b2 (patch) | |
| tree | 76c2d963be0b7c70705369ca4a9f82946df8bba8 /system/core/Loader.php | |
| parent | 5dd84d04294b622f8b85f8aaac54d8329a2ae173 (diff) | |
| parent | 3bb336cf1c55584bb92ed32563a9543ec7f01574 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'system/core/Loader.php')
| -rw-r--r-- | system/core/Loader.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 225b43912..07166188e 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2010, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -971,6 +971,15 @@ class CI_Loader { return FALSE; } + // Autoload packages + if (isset($autoload['packages'])) + { + foreach ($autoload['packages'] as $package_path) + { + $this->add_package_path($package_path); + } + } + // Load any custom config file if (count($autoload['config']) > 0) { |