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

alexbilbie · alexbilbie · commit ec298a5c392a · 2012-07-17T18:43:21.000+01:00
diff --git a/system/core/Loader.php b/system/core/Loader.php
@@ -1091,7 +1091,7 @@ protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object
 		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
@@ -529,7 +529,7 @@ protected function _update_batch($table, $values, $index, $where = NULL)
 		$cases = '';
 		foreach ($final as $k => $v)
 		{
-			$cases .= $k.' = (CASE '.$k."\n"
+			$cases .= $k.' = (CASE '.$index."\n"
 				.implode("\n", $v)."\n"
 				.'ELSE '.$k.' END), ';
 		}

Original file line number	Diff line number	Diff line change
`@@ -1091,7 +1091,7 @@ protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object`
`1091`	`1091`	`if ( ! class_exists($name))`
`1092`	`1092`	`{`
`1093`	`1093`	`log_message('error', 'Non-existent class: '.$name);`
`1094`		`- show_error('Non-existent class: '.$class);`
	`1094`	`+ show_error('Non-existent class: '.$name);`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`	`1097`	`// Set the variable name we will assign the class to`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ protected function _update_batch($table, $values, $index, $where = NULL)`
`529`	`529`	`$cases = '';`
`530`	`530`	`foreach ($final as $k => $v)`
`531`	`531`	`{`
`532`		`- $cases .= $k.' = (CASE '.$k."\n"`
	`532`	`+ $cases .= $k.' = (CASE '.$index."\n"`
`533`	`533`	`.implode("\n", $v)."\n"`
`534`	`534`	`.'ELSE '.$k.' END), ';`
`535`	`535`	`}`