diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
| commit | f22ce8f368e64b1c343e06427e8dad1ab1cef2a4 (patch) | |
| tree | f0552e9318a541e82c3375646fc870490d835e12 /system/database/drivers/mysqli/mysqli_result.php | |
| parent | 36fb8de7bf385036f3145dd1fbd9537f6a01ac36 (diff) | |
| parent | 40d1a7684444f6a8eb4cda23d8822f0b258f0c3e (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_result.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_result.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index ac863056a..bbfb8481a 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -86,10 +86,10 @@ class CI_DB_mysqli_result extends CI_DB_result { $retval = array(); while ($field = mysqli_fetch_object($this->result_id)) { - preg_match('/([a-zA-Z]+)\((\d+)\)/', $field->Type, $matches); + preg_match('/([a-zA-Z]+)(\((\d+)\))?/i', $field->Type, $matches); $type = $matches[1]; - $length = (int)$matches[2]; + $length = isset($matches[3]) ? (int) $matches[3] : NULL; $F = new stdClass(); $F->name = $field->Field; |