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

Resolved merge conflict

Browse Source
This commit is contained in:
Madhura Jayaratne 2018-05-15 05:38:55 +10:00
commit 80f93d6f02
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
- issue #14249 Fix for missing go button in view edit
- issue #14125 Fix for issues with spatial fields
- issue #14189 Remember table's sorting broken
- issue #14289 Fix multi-column sorting
4.8.0.1 (2018-04-19)
- issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02

17
js/multi_column_sort.js
View File

@ -49,27 +49,32 @@ function removeColumnFromMultiSort (target, parent) {
// is remembered via the RememberSorting directive
URL.tail += PMA_commonParams.get('arg_separator') + 'discard_remembered_sort=1';
}
URL.head = URL.head.substring(URL.head.indexOf('?') + 1);
var middle_part = columns.join('%2C+');
url = URL.head + middle_part + URL.tail;
return url;
params = URL.head + middle_part + URL.tail;
return params;
}
AJAX.registerOnload('keyhandler.js', function () {
$('th.draggable.column_heading.pointer.marker a').on('click', function (event) {
var url = $(this).parent().find('input').val();
var argsep = PMA_commonParams.get('arg_separator')
if (event.ctrlKey || event.altKey) {
event.preventDefault();
url = removeColumnFromMultiSort(url, $(this).parent());
if (url) {
var params = removeColumnFromMultiSort(url, $(this).parent());
if (params) {
AJAX.source = $(this);
PMA_ajaxShowMessage();
$.get(url, { 'ajax_request' : true, 'ajax_page_request' : true }, AJAX.responseHandler);
params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
$.post('sql.php', params, AJAX.responseHandler);
}
} else if (event.shiftKey) {
event.preventDefault();
AJAX.source = $(this);
PMA_ajaxShowMessage();
$.get(url, { 'ajax_request' : true, 'ajax_page_request' : true }, AJAX.responseHandler);
var params = url.substring(url.indexOf('?') + 1);
params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
$.post('sql.php', params, AJAX.responseHandler);
}
});
});