gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1413 from nisargjhaveri/dropdown_placeholder

Browse Source 
Better implementation of placeholder in dropdowns
This commit is contained in:
Marc Delisle 2014-12-04 08:55:07 -05:00
commit 6596f1e5f7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/Util.class.php
View File

@ -2704,20 +2704,28 @@ class PMA_Util
. (! empty($class) ? ' class="' . htmlspecialchars($class) . '"' : '')
. '>';
if (!empty($placeholder)) {
$result .= '<option value="" disabled="disabled"'
. ' selected="selected">' . $placeholder . '</option>';
}
$resultOptions = '';
$selected = false;
foreach ($choices as $one_choice_value => $one_choice_label) {
$result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
$resultOptions .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
if ($one_choice_value == $active_choice && empty($placeholder)) {
$result .= ' selected="selected"';
if ($one_choice_value == $active_choice) {
$resultOptions .= ' selected="selected"';
$selected = true;
}
$result .= '>' . htmlspecialchars($one_choice_label) . '</option>';
$resultOptions .= '>' . htmlspecialchars($one_choice_label) . '</option>';
}
$result .= '</select>';
if (!empty($placeholder)) {
$resultOptions = '<option value="" disabled="disabled"'
. ( !$selected ? ' selected="selected"' : '' )
. '>' . $placeholder . '</option>'
. $resultOptions;
}
$result .= $resultOptions
. '</select>';
return $result;
}