8 files changed, 10 insertions, 11 deletions

diff --git a/system/database/DB.php b/system/database/DB.php
index a148c9ffe..d2afce982 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -22,7 +22,7 @@
  * @author		Rick Ellis
  * @link		http://www.codeigniter.com/user_guide/database/
  */
-function DB($params = '', $active_record = FALSE)
+function &DB($params = '', $active_record = FALSE)
 {
 	// Load the DB config file if a DSN string wasn't passed
 	if (is_string($params) AND strpos($params, '://') === FALSE)
@@ -78,7 +78,7 @@ function DB($params = '', $active_record = FALSE)
 
 	// Instantiate the DB adapter
 	$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
-	$DB = new $driver($params);	
+	$DB =& new $driver($params);	
 	return $DB;
 }	
 
diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php
index 129ba6861..24ff1e13c 100644
--- a/system/database/drivers/mssql/mssql_utility.php
+++ b/system/database/drivers/mssql/mssql_utility.php
@@ -106,7 +106,7 @@ class CI_DB_mssql_utility extends CI_DB_utility {
 	 */
 	function _repair_table($table)
 	{
-		return return FALSE; // Is this supported in MS SQL?
+		return FALSE; // Is this supported in MS SQL?
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index 96be09506..f4e912183 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -106,7 +106,7 @@ class CI_DB_oci8_utility extends CI_DB_utility {
 	 */
 	function _repair_table($table)
 	{
-		return return FALSE; // Is this supported in Oracle?
+		return FALSE; // Is this supported in Oracle?
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 9cb2cf027..ecce5be40 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -131,7 +131,7 @@ class CI_DB_sqlite_utility extends CI_DB_utility {
 	 */
 	function _repair_table($table)
 	{
-		return return FALSE;
+		return FALSE;
 	}
 
 	// --------------------------------------------------------------------
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 '';
 		}
diff --git a/user_guide/index.html b/user_guide/index.html
index f55e7af6f..395d73900 100644
--- a/user_guide/index.html
+++ b/user_guide/index.html
@@ -65,7 +65,7 @@ window.onload = function() {
 <h2>Welcome to Code Igniter</h2>

 

 <p>Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.  

-Its goal is to enable you to develop projects must faster than you could if you were writing code 

+Its goal is to enable you to develop projects much faster than you could if you were writing code 

 from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and

 logical structure to access these libraries. Code Igniter lets you creatively focus on your project by 

 minimizing the amount of code needed for a given task.</p>

diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
index 720122a75..bf8a4e0d7 100644
--- a/user_guide/overview/at_a_glance.html
+++ b/user_guide/overview/at_a_glance.html
@@ -65,7 +65,7 @@ What is Code Igniter?
 

 <h2>Code Igniter is an Application Framework</h2>

 

-<p>Code Igniter is a toolkit for people who build web application using PHP.  Its goal is to enable you to develop projects must faster than you could if you were writing code 

+<p>Code Igniter is a toolkit for people who build web application using PHP.  Its goal is to enable you to develop projects much faster than you could if you were writing code 

 from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and

 logical structure to access these libraries. Code Igniter lets you creatively focus on your project by 

 minimizing the amount of code needed for a given task.</p>