From bf0198938ce19b10b1f66c4daf3c30c631cf130c Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Mon, 16 Apr 2018 19:33:28 +0530 Subject: [PATCH 1/2] Remember table's sorting broken in 4.8.0 issue: #14189 fixed Signed-off-by: Piyush Vijay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e58dd74c40a10d79628de70b6a5b0856940fee2c) Signed-off-by: Maurício Meneghini Fauth --- js/sql.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 74aa9c22ba..21b7d1f714 100644 --- a/js/sql.js +++ b/js/sql.js @@ -169,9 +169,17 @@ AJAX.registerOnload('sql.js', function () { PMA_autosaveSQL($('#sqlquery').val()); }); // Save sql query with sort - $('select[name="sql_query"]').on('change', function () { - PMA_autosaveSQLSort($('select[name="sql_query"]').val()); - }); + if ($('#RememberSorting') !== undefined && $('#RememberSorting').is(':checked')) { + $('select[name="sql_query"]').on('change', function () { + PMA_autosaveSQLSort($('select[name="sql_query"]').val()); + }); + } else { + if (isStorageSupported('localStorage') && window.localStorage.auto_saved_sql_sort !== undefined) { + window.localStorage.removeItem('auto_saved_sql_sort'); + } else { + Cookies.set('auto_saved_sql_sort', ''); + } + } // If sql query with sort for current table is stored, change sort by key select value var sortStoredQuery = (isStorageSupported('localStorage') && typeof window.localStorage.auto_saved_sql_sort !== 'undefined') ? window.localStorage.auto_saved_sql_sort : Cookies.get('auto_saved_sql_sort'); if (typeof sortStoredQuery !== 'undefined' && sortStoredQuery !== $('select[name="sql_query"]').val() && $('select[name="sql_query"] option[value="' + sortStoredQuery + '"]').length !== 0) { From fd7ec14fc207ae86d3d86c975a325cda093ebf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sat, 12 May 2018 04:57:13 -0300 Subject: [PATCH 2/2] Add ChangeLog entry for #14189 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index bb7f4028b4..55f3726b57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - issue #13968 Fix MariaDB 10.2 current_timestamp() - 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 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02