diff options
| author | Florian Pritz <bluewind@xinu.at> | 2019-09-27 22:38:06 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2019-09-27 22:38:06 +0200 |
| commit | 9067e097cc335b4ec207d7c8c6a819741446a163 (patch) | |
| tree | 3770e3d890ae5d968a1873ff55c40cedcc5a88af /system/database/drivers/pdo/pdo_result.php | |
| parent | 3db68e2e947b6299a15ed5277b65b49ad1768415 (diff) | |
| parent | b73eb19aed66190c10c9cad476da7c36c271d6dc (diff) | |
Merge tag '3.1.11' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/drivers/pdo/pdo_result.php')
| -rw-r--r-- | system/database/drivers/pdo/pdo_result.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php index 03c0f9f9d..b3973da46 100644 --- a/system/database/drivers/pdo/pdo_result.php +++ b/system/database/drivers/pdo/pdo_result.php @@ -133,7 +133,7 @@ class CI_DB_pdo_result extends CI_DB_result { $retval[$i] = new stdClass(); $retval[$i]->name = $field['name']; - $retval[$i]->type = $field['native_type']; + $retval[$i]->type = isset($field['native_type']) ? $field['native_type'] : null; $retval[$i]->max_length = ($field['len'] > 0) ? $field['len'] : NULL; $retval[$i]->primary_key = (int) ( ! empty($field['flags']) && in_array('primary_key', $field['flags'], TRUE)); } |