From eee2df6846ec072303dd87192d328fbd1de6b06a Mon Sep 17 00:00:00 2001 From: jonnu Date: Mon, 16 Jul 2012 13:06:16 +0100 Subject: Inconsistency between log_message and show_error when encountering a non-existant class Signed-off-by: jonnu --- system/core/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-24-g4f1b From 7f875b70c1f90cebc434aa9a0238c406e29ee4bc Mon Sep 17 00:00:00 2001 From: aroche Date: Mon, 16 Jul 2012 18:22:08 +0300 Subject: Fix on _update_batch() : wrong variable used for field selection --- system/database/drivers/postgre/postgre_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), '; } -- cgit v1.2.3-24-g4f1b