Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

ChangeLog

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug       Undefined index navwork
 - bug #4744 Opening console scroll down the page
 - bug       Remove extra column heading in view structure page
+- bug       Add missing confirmation when deleting central columns
 
 4.3.9.0 (2015-02-05)
 - bug #4728 Incorrect headings in routine editor

js/db_central_columns.js

@@ -72,10 +72,16 @@ AJAX.registerOnload('db_central_columns.js', function () {
             $('#f_'+rownum+' .default_type').siblings('.default_value').hide();
         }
     });
-    $(".del_row").click(function() {
-        rownum = $(this).data('rownum');
-        $("#del_col_name").val($('#f_'+rownum +' td[name=col_name] span').html());
-        $("#del_form").submit();
+    $(".del_row").click(function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+        $td = $(this);
+        var question = PMA_messages.strDeleteCentralColumnWarning;
+        $td.PMA_confirm(question, null, function (url) {
+            rownum = $td.data('rownum');
+            $("#del_col_name").val($('#f_' + rownum +' td[name=col_name] span').html());
+            $("#del_form").submit();
+        });
     });
     $('.edit_cancel_form').click(function(event) {
         event.preventDefault();

js/messages.php

@@ -46,6 +46,7 @@ $js_messages['strDropUserGroupWarning'] = __('Do you really want to delete user
 $js_messages['strConfirmDeleteQBESearch'] = __('Do you really want to delete the search "%s"?');
 $js_messages['strConfirmNavigation'] = __('You have unsaved changes; are you sure you want to leave this page?');
 $js_messages['strDropUserWarning'] = __('Do you really want to revoke the selected user(s) ?');
+$js_messages['strDeleteCentralColumnWarning'] = __('Do you really want to delete this central column?');
 
 /* For modal dialog buttons */
 $js_messages['strSaveAndClose'] = __('Save & Close');