Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -10,6 +10,8 @@ phpMyAdmin - ChangeLog
 - issue #12772 Fix case where the central columns attributes don't get filled in
 - issue #14049 Fix case where the query builder doesn't work when selected column is *
 - issue #14029 Revert "Browse" table CSS overflow
+- issue #14241 Dropping indexes and foreign keys fail
+- issue #14227 Relational linking broken
 
 4.8.0.1 (2018-04-19)
 - issue        [security] Multiple CSRF vulnerabilities, See PMASA-2018-02

js/indexes.js

@@ -601,10 +601,7 @@ AJAX.registerOnload('indexes.js', function () {
 
         $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
             var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
-            var params = {
-                'is_js_confirmed': 1,
-                'ajax_request': true
-            };
+            var params = getJSConfirmCommonParam(this, $anchor.getPostData());
             $.post(url, params, function (data) {
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxRemoveMessage($msg);

js/tbl_relation.js

@@ -222,10 +222,7 @@ AJAX.registerOnload('tbl_relation.js', function () {
 
         $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
             var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingForeignKey, false);
-            var params = {
-                'is_js_confirmed': 1,
-                'ajax_request': true
-            };
+            var params = getJSConfirmCommonParam(this, $anchor.getPostData());
             $.post(url, params, function (data) {
                 if (data.success === true) {
                     PMA_ajaxRemoveMessage($msg);

libraries/classes/Display/Results.php

@@ -5301,11 +5301,11 @@ class Results
                     // user chose "relational key" in the display options, so
                     // the title contains the display field
                     $title = (! empty($dispval))
-                        ? ' title="' . htmlspecialchars($dispval) . '"'
+                        ? htmlspecialchars($dispval)
                         : '';
 
                 } else {
-                    $title = ' title="' . htmlspecialchars($data) . '"';
+                    $title = htmlspecialchars($data);
                 }
 
                 $_url_params = array(
@@ -5320,14 +5320,10 @@ class Results
                         . $where_comparison,
                 );
 
-                $result .= '<a class="ajax" href="sql.php'
-                    . Url::getCommon($_url_params)
-                    . '"' . $title . '>';
-
                 if ($transformation_plugin != $default_function) {
                     // always apply a transformation on the real data,
                     // not on the display field
-                    $result .= $transformation_plugin->applyTransformation(
+                    $message = $transformation_plugin->applyTransformation(
                         $data,
                         $transform_options,
                         $meta
@@ -5339,14 +5335,18 @@ class Results
                     ) {
                         // user chose "relational display field" in the
                         // display options, so show display field in the cell
-                        $result .= $default_function($dispval);
+                        $message = $default_function($dispval);
                     } else {
                         // otherwise display data in the cell
-                        $result .= $default_function($data);
+                        $message = $default_function($data);
                     }
 
                 }
-                $result .= '</a>';
+                $result .= Util::linkOrButton(
+                    'sql.php' . Url::getCommon($_url_params),
+                    $message,
+                    array('class' => 'ajax', 'title' => $title)
+                );
             }
 
         } else {

libraries/classes/Index.php

@@ -765,12 +765,12 @@ class Index
                 $r .= '<td ' . $row_span . ' class="print_ignore">';
                 $r .= '<input type="hidden" class="drop_primary_key_index_msg"'
                     . ' value="' . $js_msg . '" />';
-                $r .= '    <a class="drop_primary_key_index_anchor';
-                $r .= ' ajax';
-                $r .= '" href="sql.php' . Url::getCommon($this_params)
-                   . '" >'
-                   . Util::getIcon('b_drop', __('Drop'))  . '</a>'
-                   . '</td>' . "\n";
+                $r .= Util::linkOrButton(
+                    'sql.php' . Url::getCommon($this_params),
+                    Util::getIcon('b_drop', __('Drop')),
+                    array('class' => 'drop_primary_key_index_anchor ajax')
+                );
+                $r .= '</td>' . "\n";
             }
 
             if (! $print_mode) {

templates/table/relation/foreign_key_row.twig

@@ -26,10 +26,9 @@
         {% if one_key['constraint'] is defined %}
             <input type="hidden" class="drop_foreign_key_msg" value="
                 {{- js_msg }}" />
-            <a class="drop_foreign_key_anchor ajax" href="sql.php
-                {{- Url_getCommon(this_params) }}">
-                {{ Util_getIcon('b_drop', 'Drop'|trans) }}
-            </a>
+            {% set drop_url = 'sql.php' ~ Url_getCommon(this_params) %}
+            {% set drop_str = Util_getIcon('b_drop', 'Drop'|trans) %}
+            {{ Util_linkOrButton(drop_url, drop_str, {'class': 'drop_foreign_key_anchor ajax'}) }}
         {% endif %}
     </td>
     <td>