Merge branch 'QA_4_4'

phpmyadmin · Apr 30, 2015 · e3a3d1a · e3a3d1a
2 parents cb9671d + f07fc44
commit e3a3d1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
 - bug       Fix resize icon in Designer
 - bug #4879 Exit fullscreen in Designer does not change the button text
 - bug #4880 Designer icons missing when using original theme
+- bug #4878 Column list of central columns is not cleared
 
 4.4.4.0 (2015-04-26)
 - bug #4863 Edit vs Change

diff --git a/js/db_central_columns.js b/js/db_central_columns.js
@@ -186,7 +186,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
     });
     $('#table-select').change(function(e) {
         var selectvalue = $(this).val();
-        var default_column_select = $('#column-select').html();
+        var default_column_select = $('#column-select option:first');
         var href = "db_central_columns.php";
         var params = {
             'ajax_request' : true,
@@ -198,7 +198,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
         $('#column-select').html('<option value="">' + PMA_messages.strLoading + '</option>');
         if (selectvalue !== "") {
             $.post(href, params, function (data) {
-                $('#column-select').html(default_column_select);
+                $('#column-select').empty().append(default_column_select);
                 $('#column-select').append(data.message);
             });
         }