Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop

3 files changed, 3 insertions, 3 deletions

diff --git a/index.php b/index.php
index 4955437bf..107a2095b 100644
--- a/index.php
+++ b/index.php
@@ -135,7 +135,7 @@ switch (ENVIRONMENT)
 	// if your controller is not in a sub-folder within the "controllers" folder
 	// $routing['directory'] = '';
 
-	// The controller class file name.  Example:  Mycontroller
+	// The controller class file name.  Example:  mycontroller
 	// $routing['controller'] = '';
 
 	// The controller function you wish to be called.
diff --git a/system/core/Loader.php b/system/core/Loader.php
index bfcef1cbc..0bc6e844a 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1091,7 +1091,7 @@ class CI_Loader {
 		if ( ! class_exists($name))
 		{
 			log_message('error', 'Non-existent class: '.$name);
-			show_error('Non-existent class: '.$class);
+			show_error('Non-existent class: '.$name);
 		}
 
 		// Set the variable name we will assign the class to
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 20b78673e..031740851 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -529,7 +529,7 @@ class CI_DB_postgre_driver extends CI_DB {
 		$cases = '';
 		foreach ($final as $k => $v)
 		{
-			$cases .= $k.' = (CASE '.$k."\n"
+			$cases .= $k.' = (CASE '.$index."\n"
 				.implode("\n", $v)."\n"
 				.'ELSE '.$k.' END), ';
 		}