summaryrefslogtreecommitdiffstats
path: root/system/database/DB_active_rec.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 13:43:04 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 13:43:04 +0100
commit7ccb7ecc8e84f8e4f4cdf5ed10247f4350c7ec34 (patch)
treec070c13151562383c3f65507ca27d4153f50827a /system/database/DB_active_rec.php
parent18c9ea77c7c68be38ea1b995cccff18ee2e6acb4 (diff)
parentc2905f5884a7d9cd9ae1f70cdc615a5d214652dd (diff)
Merge upstream branch
Diffstat (limited to 'system/database/DB_active_rec.php')
-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;