diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2009-02-03 17:13:57 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2009-02-03 17:13:57 +0100 |
| commit | e37ab385f5c9ef8824d2ad4e31f544dbe6089095 (patch) | |
| tree | 50d2cc1476bf17b415625526bd2b728e045520b4 /system/database/DB_active_rec.php | |
| parent | 1978e12d4221fe7e61749a3206b086e5d4158f77 (diff) | |
DB count_all() not returns an integer always
Added some syntactical improvements within DB (braces)
Fixed a bug when doing 'random' on order_by() (#5706).
Fixed a bug where adding a primary key through Forge could fail (#5731).
Fixed a bug when using DB cache on multiple databases (#5737).
Diffstat (limited to 'system/database/DB_active_rec.php')
| -rw-r--r-- | system/database/DB_active_rec.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index b8dce6df5..c757e6ae6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -913,7 +913,7 @@ class CI_DB_active_record extends CI_DB_driver { $orderby = implode(', ', $temp); } - else + else if ($direction != $this->_random_keyword) { $orderby = $this->_protect_identifiers($orderby); } |