diff options
author | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
commit | 1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 (patch) | |
tree | b0c645ad99e04f34817fc4e6385792111db42274 /system/database/DB_active_rec.php | |
parent | 413d0cdac49257089a0790f6ac92973a36a6b69f (diff) |
update to CI 2.0.2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Diffstat (limited to 'system/database/DB_active_rec.php')
-rwxr-xr-x | system/database/DB_active_rec.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index ce9d1c1af..db8471364 100755 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -954,7 +954,7 @@ class CI_DB_active_record extends CI_DB_driver { } else { - $this->ar_set[$this->_protect_identifiers($k)] = $this->escape($v); + $this->ar_set[$this->_protect_identifiers($k, FALSE, TRUE)] = $this->escape($v); } } @@ -1020,11 +1020,11 @@ class CI_DB_active_record extends CI_DB_driver { if ($query->num_rows() == 0) { - return '0'; + return 0; } $row = $query->row(); - return $row->numrows; + return (int) $row->numrows; } // -------------------------------------------------------------------- @@ -1156,7 +1156,7 @@ class CI_DB_active_record extends CI_DB_driver { $this->ar_set[] = array(); return; } - + ksort($row); // puts $row in the same order as our keys if ($escape === FALSE) @@ -1167,7 +1167,7 @@ class CI_DB_active_record extends CI_DB_driver { { $clean = array(); - foreach($row as $value) + foreach ($row as $value) { $clean[] = $this->escape($value); } @@ -1425,7 +1425,7 @@ class CI_DB_active_record extends CI_DB_driver { $index_set = FALSE; $clean = array(); - foreach($v as $k2 => $v2) + foreach ($v as $k2 => $v2) { if ($k2 == $index) { @@ -1569,7 +1569,7 @@ class CI_DB_active_record extends CI_DB_driver { } elseif (is_array($table)) { - foreach($table as $single_table) + foreach ($table as $single_table) { $this->delete($single_table, $where, $limit, FALSE); } |