diff options
| author | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
|---|---|---|
| committer | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
| commit | ab0dbd4b992778678e00ea3f2a3dd4bf5f1ff504 (patch) | |
| tree | 740d3cabe5e51f18578a72abf6e13e62fba9eb62 /system/database/drivers | |
| parent | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (diff) | |
| parent | 2eb2557bf1c438d8fb7d612dbb76c6676eaec4d6 (diff) | |
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/mysql/mysql_result.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_result.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index 2d2905c98..6ceaf4b9b 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -86,10 +86,10 @@ class CI_DB_mysql_result extends CI_DB_result { $retval = array(); while ($field = mysql_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; 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; |