Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Apr 27, 2012
2 parents ae9272a + 4c768d4 commit d0ab99f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions libraries/common.lib.php
Expand Up @@ -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
);
Expand All @@ -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
);
Expand Down

0 comments on commit d0ab99f

Please sign in to comment.