From 8b2f19b7b2671526c8e5eca74251b6339932e5bf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 6 Mar 2008 15:51:55 +0000 Subject: change to the way AR handles aliased tables --- system/database/DB_active_rec.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'system/database/DB_active_rec.php') diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index add0b8c94..bde43abf0 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1434,17 +1434,15 @@ class CI_DB_active_record extends CI_DB_driver { */ function _filter_table_aliases($statements) { + foreach ($statements as $k => $v) { foreach ($this->ar_aliased_tables as $table) { - $statement = preg_replace('/(\w+\.\w+)/', $this->_protect_identifiers('$0'), $v); // makes `table.field` - $statement = str_replace(array($this->dbprefix.$table, '.'), array($table, $this->_protect_identifiers('.')), $statement); + $statements[$k] = preg_replace('/(\w+\.\w+)/', $this->_protect_identifiers('$0'), $statements[$k]); // makes `table.field` + $statements[$k] = str_replace($this->dbprefix.$table.'.', $table.'.', $statements[$k]); } - - $statements[$k] = $statement; } - return $statements; } -- cgit v1.2.3-24-g4f1b