summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-03-01 12:32:18 +0100
committerTimothy Warren <tim@timshomepage.net>2012-03-01 12:32:18 +0100
commit7842b1bc8cc007521dcc55de613d6e3224cfe2c1 (patch)
tree0631ea110b3e8b9de0159ffaab345926a3cd4884 /system/database
parent9a96082726feadadd50aef1287b4e0df61414c0d (diff)
parent76f15c9bb3004e6da99dd273c34ef3b92a23c17f (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 424735157..eaae23f30 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -236,7 +236,8 @@ class CI_DB_active_record extends CI_DB_driver {
{
if (strpos($item, '.') !== FALSE)
{
- return end(explode('.', $item));
+ $item = explode('.', $item);
+ return end($item);
}
return $item;