summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-07-17 19:43:21 +0200
committerAlex Bilbie <alex@alexbilbie.com>2012-07-17 19:43:21 +0200
commitec298a5c392a05af4596e2bc2282a0e8ef8a74db (patch)
treed9657d9444e76192b7f4c9143332abdf82aca8c9 /system
parent6697cf0c64d34992f8b2a97383d582b2fbf66b1f (diff)
parent4253d320e229150eab6e5d0333508c85e434f3e3 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'system')
-rw-r--r--system/core/Loader.php2
-rw-r--r--system/database/drivers/postgre/postgre_driver.php2
2 files changed, 2 insertions, 2 deletions
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), ';
}