From 22259b5d0518ed67eaffc5513c3b49e4b08407c0 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Tue, 22 Jan 2008 01:47:11 +0000
Subject:

---
 system/libraries/Loader.php | 20 ++++++++------------
 user_guide/changelog.html   |  3 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index e2420a0c0..b760d67a1 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -895,11 +895,7 @@ class CI_Loader {
 			}		
 		}
 
-		// Autoload models
-		if (isset($autoload['model']))
-		{
-			$this->model($autoload['model']);
-		}
+
 
 		// A little tweak to remain backward compatible
 		// The $autoload['core'] item was deprecated
@@ -930,14 +926,14 @@ class CI_Loader {
 			{
 				$this->library($item);
 			}
-
-			// Load the model class.
-			if (in_array('model', $autoload['libraries']))
-			{
-				$this->model();
-				$autoload['libraries'] = array_diff($autoload['libraries'], array('model'));
-			}
 		}		
+
+		// Autoload models
+		if (isset($autoload['model']))
+		{
+			$this->model($autoload['model']);
+		}
+
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 0bfa89245..95be683d3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -151,7 +151,8 @@ Change Log
 <h3>Bug fixes for Version 1.6.0</h3>
 	
 <ul>
-	<li>Fixed a bug (#3268) where the Router could leave '/' as the path.</li>
+	<li>Removed an extraneous call to loading models (#3286).</li>
+    <li>Fixed a bug (#3268) where the Router could leave '/' as the path.</li>
     <li>Fixed a bug in <kbd>highlight_phrase()</kbd> that caused an error with slashes.</li>
     <li>Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.</li>
     <li>Fixed a bug in the <a href="./libraries/file_uploading.html">upload library</a> when allowed_files wasn't defined.</li>
-- 
cgit v1.2.3-24-g4f1b