From 9a661810d2b9b96c458c1f369f0059b31012b6a8 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Mon, 16 Oct 2006 19:02:48 +0000
Subject:

---
 system/libraries/Loader.php | 5 ++---
 system/libraries/Router.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 7bf11609b..b402464e2 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -703,9 +703,8 @@ class CI_Loader {
 	function _ci_init_class($class, $prefix = '', $config = NULL)
 	{	
 		// Is there an associated config file for this class?
-		if ($config !== NULL)
-		{
-			$config = NULL;
+		if ($config === NULL)
+		{ 
 			if (file_exists(APPPATH.'config/'.$class.EXT))
 			{
 				include_once(APPPATH.'config/'.$class.EXT);
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index bbfa0d192..06037209b 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -373,7 +373,7 @@ class CI_Router {
 		
 		$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
 
-		if ($request_uri == '' OR $request_uri == SELF)
+		if ($request_uri == '' OR $request_uri == $this->config->item('index_page'))
 		{
 			return '';
 		}
-- 
cgit v1.2.3-24-g4f1b