From db210da098f6a52b333abbeeb7c51c35e14b5354 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 7 Dec 2012 07:44:36 -0500
Subject: [PATCH] Clarify the conditions

---
 libraries/Util.class.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 3e9addfc37..300183bb37 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2346,14 +2346,7 @@ class PMA_Util
 
         /* Opera has trouble with <input type="image"> */
         /* IE (before version 9) has trouble with <button> */
-        if (PMA_USR_BROWSER_AGENT != 'IE'
-            || (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER > 8)) {
-            return '<button class="' . $button_class . '" type="submit"'
-                .' name="' . $button_name . '" value="' . htmlspecialchars($value)
-                . '" title="' . htmlspecialchars($text) . '">' . "\n"
-                . self::getIcon($image, $text)
-                .'</button>' . "\n";
-        } else {
+        if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
             return '<input type="image" name="' . $image_name
                 . '" value="' . htmlspecialchars($value)
                 . '" title="' . htmlspecialchars($text)
@@ -2361,6 +2354,12 @@ class PMA_Util
                 . ($GLOBALS['cfg']['PropertiesIconic'] === 'both'
                     ? '&nbsp;' . htmlspecialchars($text)
                     : '') . "\n";
+        } else {
+            return '<button class="' . $button_class . '" type="submit"'
+                .' name="' . $button_name . '" value="' . htmlspecialchars($value)
+                . '" title="' . htmlspecialchars($text) . '">' . "\n"
+                . self::getIcon($image, $text)
+                .'</button>' . "\n";
         }
     } // end function