Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-04-27 18:55:37 +02:00
commit d0ab99f16a

View File

@ -3435,17 +3435,17 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
foreach ($value as $subvalue) {
if ($subvalue == $selected) {
$retval .= sprintf(
"<option selected='selected' title='%s'>%s</option>",
'<option selected="selected" title="%s">%s</option>',
$GLOBALS['PMA_Types']->getTypeDescription($subvalue),
$subvalue
);
} else if ($subvalue === '-') {
$retval .= "<option disabled='disabled'>";
$retval .= '<option disabled="disabled">';
$retval .= $subvalue;
$retval .= "</option>";
$retval .= '</option>';
} else {
$retval .= sprintf(
"<option title='%s'>%s</option>",
'<option title="%s">%s</option>',
$GLOBALS['PMA_Types']->getTypeDescription($subvalue),
$subvalue
);
@ -3455,13 +3455,13 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
} else {
if ($selected == $value) {
$retval .= sprintf(
"<option selected='selected' title='%s'>%s</option>",
'<option selected="selected" title="%s">%s</option>',
$GLOBALS['PMA_Types']->getTypeDescription($value),
$value
);
} else {
$retval .= sprintf(
"<option title='%s'>%s</option>",
'<option title="%s">%s</option>',
$GLOBALS['PMA_Types']->getTypeDescription($value),
$value
);