diff options
author | Shane Pearson <bubbafoley@gmail.com> | 2011-08-22 23:11:20 +0200 |
---|---|---|
committer | Shane Pearson <bubbafoley@gmail.com> | 2011-08-22 23:11:20 +0200 |
commit | ab57a3520eafacaf2f130b3f4778a57a632fac1c (patch) | |
tree | 3ecdd8f1a5e38c3d5a79e0a6f2afe1b4d6538b4d | |
parent | ff390b9c43f33ee734b5e8abc754539799a19357 (diff) |
Fix #8 - Load core classes from the application folder first.
-rw-r--r-- | system/core/Common.php | 6 | ||||
-rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index db9fbeb9f..3c62403ac 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -132,9 +132,9 @@ if ( ! function_exists('load_class')) $name = FALSE; - // Look for the class first in the native system/libraries folder - // thenin the local application/libraries folder - foreach (array(BASEPATH, APPPATH) as $path) + // Look for the class first in the local application/libraries folder + // then in the native system/libraries folder + foreach (array(APPPATH, BASEPATH) as $path) { if (file_exists($path.$directory.'/'.$class.'.php')) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9d8fd2b54..e5501abbc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -105,6 +105,7 @@ Change Log <li>Fixed a bug (#181) where a mis-spelling was in the form validation language file.</li> <li>Fixed a bug (#160) - Removed unneeded array copy in the file cache driver.</li> <li>Fixed a bug (#150) - <samp>field_data()</samp> now correctly returns column length.</li> + <li>Fixed a bug (#8) - Look for core classes in <samp>APPPATH</samp> first.</li> </ul> <h2>Version 2.0.3</h2> |