gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #14241 Dropping indexes and foreign keys fail

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2018-04-29 23:54:28 +10:00
parent a568708411
commit 49e2a98158
5 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ 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
4.8.0.1 (2018-04-19)
- issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02

5
js/indexes.js
View File

@ -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);

5
js/tbl_relation.js
View File

@ -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);

12
libraries/classes/Index.php
View File

@ -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) {

7
templates/table/relation/foreign_key_row.twig
View File

@ -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>