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_result.php | |
| parent | 61dfda5953f99813f8309a4fa843c255b6631224 (diff) | |
| parent | d282d07dfba94b5395d1dd989bdb958c972bb7cf (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_result.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_result.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 0b3d9c2b4..bd465c405 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -130,10 +130,10 @@ class CI_DB_mysqli_result extends CI_DB_result { * mysqli_result::fetch_fields() * * @used-by CI_DB_mysqli_result::field_data() - * @param int $flags + * @param int $type * @return string */ - private static function _get_field_type($flags) + private static function _get_field_type($type) { static $map; isset($map) OR $map = array( @@ -164,15 +164,7 @@ class CI_DB_mysqli_result extends CI_DB_result { MYSQLI_TYPE_GEOMETRY => 'geometry' ); - foreach ($map as $flag => $name) - { - if ($flags & $flag) - { - return $name; - } - } - - return $flags; + return isset($map[$type]) ? $map[$type] : $type; } // -------------------------------------------------------------------- |