diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
| commit | 7907f98a963c0cb8625ecbb4d8a178c6d769339a (patch) | |
| tree | 0ae85eb89a0d774d36eaf0ddba9509cdced973d8 /system/database/drivers/mysqli/mysqli_utility.php | |
| parent | 61dfda5953f99813f8309a4fa843c255b6631224 (diff) | |
| parent | d282d07dfba94b5395d1dd989bdb958c972bb7cf (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_utility.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_utility.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 1699b611f..82cf5cebf 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -155,11 +155,7 @@ class CI_DB_mysqli_utility extends CI_DB_utility { while ($field = $query->result_id->fetch_field()) { // Most versions of MySQL store timestamp as a string - $is_int[$i] = ($field->type & MYSQLI_TYPE_TINY) - OR ($field->type & MYSQLI_TYPE_SHORT) - OR ($field->type & MYSQLI_TYPE_INT24) - OR ($field->type & MYSQLI_TYPE_LONG) - OR ($field->type & MYSQLI_TYPE_LONGLONG); + $is_int[$i] = in_array($field->type, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_INT24, MYSQLI_TYPE_LONG), TRUE); // Create a string of field names $field_str .= $this->db->escape_identifiers($field->name).', '; |