Removed deprecated defines
Made sure that unknown field types are mapped to null
This commit is contained in:
parent
7bf17c1843
commit
52d44758ea
@ -33,16 +33,6 @@ if (! defined('MYSQLI_BINARY_FLAG')) {
|
||||
define('MYSQLI_BINARY_FLAG', 128);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see http://bugs.php.net/36007
|
||||
*/
|
||||
if (! defined('MYSQLI_TYPE_NEWDECIMAL')) {
|
||||
define('MYSQLI_TYPE_NEWDECIMAL', 246);
|
||||
}
|
||||
if (! defined('MYSQLI_TYPE_BIT')) {
|
||||
define('MYSQLI_TYPE_BIT', 16);
|
||||
}
|
||||
|
||||
/**
|
||||
* connects to the database server
|
||||
*
|
||||
@ -553,7 +543,7 @@ function PMA_DBI_get_fields_meta($result)
|
||||
|
||||
foreach ($fields as $k => $field) {
|
||||
$fields[$k]->_type = $field->type;
|
||||
$fields[$k]->type = $typeAr[$field->type];
|
||||
$fields[$k]->type = isset($typeAr[$field->type]) ? $typeAr[$field->type] : null;
|
||||
$fields[$k]->_flags = $field->flags;
|
||||
$fields[$k]->flags = PMA_DBI_field_flags($result, $k);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user