From 4547c9a7c8dc197043f722a68a698e8d07cd16d7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 18 Dec 2012 08:19:13 -0500
Subject: [PATCH] Handle the multiple columns Change input (for IE < 9)

---
 js/tbl_structure.js      | 4 ++--
 libraries/Util.class.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 10cb1ee0a8..85e6102540 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -23,7 +23,7 @@
  */
 AJAX.registerTeardown('tbl_structure.js', function() {
     $("a.change_column_anchor.ajax").die('click');
-    $("button.change_columns_anchor.ajax").die('click');
+    $("button.change_columns_anchor.ajax, input.change_columns_anchor.ajax").die('click');
     $("a.drop_column_anchor.ajax").die('click');
     $("a.add_primary_key_anchor.ajax").die('click');
     $('a.drop_primary_key_index_anchor.ajax').die('click');
@@ -55,7 +55,7 @@ AJAX.registerOnload('tbl_structure.js', function() {
      *
      * (see $GLOBALS['cfg']['AjaxEnable'])
      */
-    $("button.change_columns_anchor.ajax").live('click', function(event) {
+    $("button.change_columns_anchor.ajax, input.change_columns_anchor.ajax").live('click', function(event) {
         event.preventDefault();
         $('#page_content').hide();
         var $form = $(this).closest('form');
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 5287386b35..1da643eab2 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2321,7 +2321,7 @@ class PMA_Util
      * Generate a button or image tag
      *
      * @param string $button_name  name of button element
-     * @param string $button_class class of button element
+     * @param string $button_class class of button or image element
      * @param string $image_name   name of image element
      * @param string $text         text to display
      * @param string $image        image to display
@@ -2348,6 +2348,7 @@ class PMA_Util
         /* IE (before version 9) has trouble with <button> */
         if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
             return '<input type="image" name="' . $image_name
+                . '" class="' . $button_class 
                 . '" value="' . htmlspecialchars($value)
                 . '" title="' . htmlspecialchars($text)
                 . '" src="' . $GLOBALS['pmaThemeImage']. $image . '" />'