diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-05-12 19:51:47 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-05-12 19:51:47 +0200 |
| commit | a632589001aa9ec769f9a80871097ce3a09b74d1 (patch) | |
| tree | 5140c01081d47a08be3c2280e8e926a901dd995c /system | |
| parent | c14968d0a2d6f25cdaf333b8f697991177387bed (diff) | |
Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_active_rec.php | 13 |
1 files changed, 10 insertions, 3 deletions
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 |