From a632589001aa9ec769f9a80871097ce3a09b74d1 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 12 May 2008 17:51:47 +0000 Subject: Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478). --- system/database/DB_active_rec.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 a4ef2e4db..9a7ef5def 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -95,7 +95,14 @@ class CI_DB_active_record extends CI_DB_driver { { if (is_string($select)) { - $select = explode(',', $select); + if ($protect_identifiers !== FALSE) + { + $select = explode(',', $select); + } + else + { + $select = array($select); + } } foreach ($select as $val) @@ -1749,6 +1756,6 @@ class CI_DB_active_record extends CI_DB_driver { } } - -/* End of file DB_active_rec.php */ + +/* End of file DB_active_rec.php */ /* Location: ./system/database/DB_active_rec.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b