From f69c48b686a552ed51d2d9840d1789763d49d54e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 3 Dec 2014 12:47:44 -0500
Subject: [PATCH] Improve HTML

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/Util.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 21ad22ef35..2e291c1701 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2705,13 +2705,14 @@ class PMA_Util
             . '>';
 
         if (!empty($placeholder)) {
-            $result .= '<option style="display: none">'.$placeholder.'</option>';
+            $result .= '<option value="" disabled="disabled"'
+                . ' selected="selected">' . $placeholder . '</option>';
         }
 
         foreach ($choices as $one_choice_value => $one_choice_label) {
             $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
 
-            if ($one_choice_value == $active_choice) {
+            if ($one_choice_value == $active_choice && empty($placeholder)) {
                 $result .= ' selected="selected"';
             }
             $result .= '>' . htmlspecialchars($one_choice_label) . '</option>';