Merge branch 'QA_4_6'

ChangeLog

@@ -69,6 +69,7 @@ phpMyAdmin - ChangeLog
 - issue #12841 Fixed moving of columns with whitespace in name
 - issue #12847 Fixed editing of virtual columns
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
+- issue #12872 Use same query for display and execution when dropping index
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

libraries/Index.php

@@ -715,9 +715,7 @@ class Index
                         . ' DROP PRIMARY KEY;';
                     $this_params['message_to_show']
                         = __('The primary key has been dropped.');
-                    $js_msg = Sanitize::jsFormat(
-                        'ALTER TABLE ' . $table . ' DROP PRIMARY KEY'
-                    );
+                    $js_msg = Sanitize::jsFormat($this_params['sql_query']);
                 } else {
                     $this_params['sql_query'] = 'ALTER TABLE '
                         . Util::backquote($table) . ' DROP INDEX '
@@ -725,12 +723,7 @@ class Index
                     $this_params['message_to_show'] = sprintf(
                         __('Index %s has been dropped.'), htmlspecialchars($index->getName())
                     );
-
-                    $js_msg = Sanitize::jsFormat(
-                        'ALTER TABLE ' . $table . ' DROP INDEX '
-                        . $index->getName() . ';'
-                    );
-
+                    $js_msg = Sanitize::jsFormat($this_params['sql_query']);
                 }
 
                 $r .= '<td ' . $row_span . ' class="print_ignore">';