Merge branch 'QA_4_3'

ChangeLog

@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - bug       Add missing confirmation when deleting central columns
 - bug       Undefined index DisableIS
 - bug #4763 Database export with more than 512 tables fails
+- bug #4769 Previously set column aliases are destroyed if returned to the same table
 
 4.3.9.0 (2015-02-05)
 - bug #4728 Incorrect headings in routine editor

js/export.js

@@ -280,12 +280,14 @@ function aliasSelectHandler(event) {
         var outer = $inputWrapper[0].outerHTML;
         // Replace opening tags
         var regex = /<dummy_inp/gi;
-        var newTag = outer.replace(regex, '<input');
-        // Replace closing tags
-        regex = /<\/dummy_inp/gi;
-        newTag = newTag.replace(regex, '</input');
-        // Assign replacement
-        $inputWrapper.replaceWith(newTag);
+        if (outer.match(regex)) {
+            var newTag = outer.replace(regex, '<input');
+            // Replace closing tags
+            regex = /<\/dummy_inp/gi;
+            newTag = newTag.replace(regex, '</input');
+            // Assign replacement
+            $inputWrapper.replaceWith(newTag);
+        }
     } else if (type === '_tables') {
         $('.table_alias_select:visible').change();
     }