summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-08-24 05:51:30 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-08-24 05:51:30 +0200
commit190d88f3e0a65e52534dc3e09438fe4d9673bf11 (patch)
tree89791aba6eab1e64f9dfb02f9857adad1c0e66b7 /system/core
parentaadf15d2b5337b7c66dc974d0b7a872030ed02c1 (diff)
parent48705c3345cf115910dbaa798f60288ea7b9ca36 (diff)
Merge pull request #268 from bubbafoley/develop
Fix #8 - Core classes can now be replaced
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php6
1 files changed, 3 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'))
{