summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Pearson <bubbafoley@gmail.com>2011-08-22 23:11:20 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-11-02 10:52:21 +0100
commit8d0a31314fbf8040cce5d7601a12fffe208ae884 (patch)
tree0726201bad0ae88858789c5a0cc0b36266ca9570
parentec58ace846cd89587e8e3dbd404192bcbf96e1c2 (diff)
Fix #8 - Load core classes from the application folder first.
-rw-r--r--system/core/Common.php6
-rw-r--r--user_guide/changelog.html4
2 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 3d6931bc0..d79375475 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 11a15370e..69ba4e6c8 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -95,7 +95,7 @@ Change Log
<li>Core
<ul>
<li>Changed private functions in <a href="libraries/cart.html">URI Library</a> to protected so <kdb>MY_URI</kdb> can override them.</li>
- <li>Removed <var>CI_CORE</var> boolean constant from CodeIgniter.php (there are no longer different Reactor and Core versions).</li>
+ <li>Removed <samp>CI_CORE</samp> boolean constant from CodeIgniter.php (there are no longer different Reactor and Core versions).</li>
</ul>
</li>
</ul>
@@ -110,7 +110,7 @@ Change Log
<li>Fixed bug #105 that stopped query errors from being logged unless database debugging was enabled</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) - load_class() now looks for core classes in APPPATH first, allowing them to be replaced.</li>
+ <li>Fixed a bug (#8) - Look for core classes in <samp>APPPATH</samp> first.</li>
<li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li>
<li>Fixed a bug (#85) - OCI8 (Oracle) database <kbd>escape_str()</kbd> function did not escape correct.</li>
<li>Fixed a bug (#344) - Using schema found in <a href="libraries/sessions.html">Saving Session Data to a Database</a>, system would throw error "user_data does not have a default value" when deleting then creating a session.</li>