diff options
| author | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-09 19:12:22 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-09 19:12:22 +0100 |
| commit | 6b6c274e00fe2357004c0a4e38e6bdb0b2e0ddb4 (patch) | |
| tree | 1e5da8d0922fe956ab30e22560b3bd1d1640ca44 /system | |
| parent | b77e5e21aaefab5c2e582064d2fc5bf97fb2f19e (diff) | |
Normalizing package paths to include a single trailing slash.
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Loader.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 5a2175c2d..e2970613b 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -535,6 +535,8 @@ class CI_Loader { */ function add_package_path($path) { + $path = rtrim($path, '/').'/'; + array_unshift($this->_ci_library_paths, $path); array_unshift($this->_ci_model_paths, $path); array_unshift($this->_ci_helper_paths, $path); @@ -569,6 +571,8 @@ class CI_Loader { } else { + $path = rtrim($path, '/').'/'; + foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) { if (($key = array_search($path, $this->{$var})) !== FALSE) |