From 984c6a0054b85c1fbadef21eb88f8872f64eba3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 1 Mar 2018 15:49:27 +0100 Subject: [PATCH 1/2] Honor arg_separator in AJAX requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13940 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/ajax.js | 9 ++++--- js/common.js | 5 ++-- js/db_central_columns.js | 8 +++--- js/db_operations.js | 4 +-- js/db_search.js | 2 +- js/db_tracking.js | 8 +++--- js/functions.js | 34 ++++++++++++++------------ js/gis_data_editor.js | 9 ++++--- js/indexes.js | 5 ++-- js/microhistory.js | 2 +- js/multi_column_sort.js | 4 +-- js/navigation.js | 24 +++++++++--------- js/normalization.js | 6 +++-- js/pmd/move.js | 53 ++++++++++++++++++++++++---------------- js/server_databases.js | 5 ++-- js/server_privileges.js | 9 ++++--- js/sql.js | 20 +++++++++------ js/tbl_operations.js | 11 ++++++--- js/tbl_relation.js | 17 +++++++------ js/tbl_structure.js | 13 +++++----- js/tbl_tracking.js | 5 ++-- libraries/Header.php | 3 ++- 23 files changed, 151 insertions(+), 106 deletions(-) diff --git a/ChangeLog b/ChangeLog index c62167f432..b54960072b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.7.9 (not yet released) +- issue #13940 Honor arg_separator in AJAX requests 4.7.8 (2018-02-20) - issue #13914 Fixed resetting default setting values. diff --git a/js/ajax.js b/js/ajax.js index ab62c27a9a..95dc70be59 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -280,12 +280,13 @@ var AJAX = { $('html, body').animate({scrollTop: 0}, 'fast'); var url = isLink ? href : $(this).attr('action'); - var params = 'ajax_request=true&ajax_page_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=true' + argsep + 'ajax_page_request=true'; var dataPost = AJAX.source.getPostData(); if (! isLink) { - params += '&' + $(this).serialize(); + params += argsep + $(this).serialize(); } else if (dataPost) { - params += '&' + dataPost; + params += argsep + dataPost; isLink = false; } if (! (history && history.pushState)) { @@ -760,7 +761,7 @@ $(function () { var state = event.originalEvent.state; if (state && state.menu) { AJAX.$msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=true&ajax_page_request=true'; + var params = 'ajax_request=true' + PMA_commonParams.get('arg_separator') + 'ajax_page_request=true'; var url = state.url || location.href; $.get(url, params, AJAX.responseHandler); //TODO: Check if sometimes menu is not retrieved from server, diff --git a/js/common.js b/js/common.js index 7bb4aadca8..d5e5c43217 100644 --- a/js/common.js +++ b/js/common.js @@ -86,11 +86,12 @@ var PMA_commonParams = (function () { getUrlQuery: function () { var common = this.get('common_query'); var separator = '?'; + var argsep = PMA_commonParams.get('arg_separator'); if (common.length > 0) { - separator = '&'; + separator = argsep; } return PMA_sprintf( - '%s%sserver=%s&db=%s&table=%s', + '%s%sserver=%s' + argsep + 'db=%s' + argsep + 'table=%s', this.get('common_query'), separator, encodeURIComponent(this.get('server')), diff --git a/js/db_central_columns.js b/js/db_central_columns.js index d3ed14b752..e17682fae9 100644 --- a/js/db_central_columns.js +++ b/js/db_central_columns.js @@ -64,7 +64,8 @@ AJAX.registerOnload('db_central_columns.js', function () { PMA_ajaxShowMessage(PMA_messages.strRadioUnchecked); return false; } - var editColumnData = editColumnList+ '&edit_central_columns_page=true&ajax_request=true&ajax_page_request=true&token='+PMA_commonParams.get('token')+'&db='+PMA_commonParams.get('db'); + var argsep = PMA_commonParams.get('arg_separator'); + var editColumnData = editColumnList+ argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'token='+PMA_commonParams.get('token') + argsep + 'db='+PMA_commonParams.get('db'); PMA_ajaxShowMessage(); AJAX.source = $(this); $.get('db_central_columns.php', editColumnData, AJAX.responseHandler); @@ -72,7 +73,8 @@ AJAX.registerOnload('db_central_columns.js', function () { $('#multi_edit_central_columns').submit(function(event){ event.preventDefault(); event.stopPropagation(); - var multi_column_edit_data = $("#multi_edit_central_columns").serialize()+'&multi_edit_central_column_save=true&ajax_request=true&ajax_page_request=true&token='+PMA_commonParams.get('token')+'&db='+PMA_commonParams.get('db'); + var argsep = PMA_commonParams.get('arg_separator'); + var multi_column_edit_data = $("#multi_edit_central_columns").serialize()+argsep+'multi_edit_central_column_save=true'+argsep+'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'token='+PMA_commonParams.get('token')+argsep+'db='+PMA_commonParams.get('db'); PMA_ajaxShowMessage(); AJAX.source = $(this); $.post('db_central_columns.php', multi_column_edit_data, AJAX.responseHandler); @@ -152,7 +154,7 @@ AJAX.registerOnload('db_central_columns.js', function () { $.ajax({ type: "POST", url: "db_central_columns.php", - data: datastring+'&ajax_request=true', + data: datastring+PMA_commonParams.get('arg_separator')+'ajax_request=true', dataType: "json", success: function(data) { if (data.message !== '1') { diff --git a/js/db_operations.js b/js/db_operations.js index a55b1e4e81..fcee734237 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -53,7 +53,7 @@ AJAX.registerOnload('db_operations.js', function () { $form.PMA_confirm(question, $form.attr('action'), function (url) { PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false); - $.post(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function (data) { + $.post(url, $("#rename_db_form").serialize() + PMA_commonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxShowMessage(data.message); PMA_commonParams.set('db', data.newname); @@ -113,7 +113,7 @@ AJAX.registerOnload('db_operations.js', function () { var $form = $(this); PMA_prepareForAjaxRequest($form); PMA_ajaxShowMessage(PMA_messages.strChangingCharset); - $.post($form.attr('action'), $form.serialize() + "&submitcollation=1", function (data) { + $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + "submitcollation=1", function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxShowMessage(data.message); } else { diff --git a/js/db_search.js b/js/db_search.js index e38534ae8e..17f4949fb1 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -212,7 +212,7 @@ AJAX.registerOnload('db_search.js', function () { PMA_prepareForAjaxRequest($form); - var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val(); + var url = $form.serialize() + PMA_commonParams.get('arg_separator') + "submit_search=" + $("#buttonGo").val(); $.post($form.attr('action'), url, function (data) { if (typeof data !== 'undefined' && data.success === true) { // found results diff --git a/js/db_tracking.js b/js/db_tracking.js index 5b771d2c75..5cbc34672e 100644 --- a/js/db_tracking.js +++ b/js/db_tracking.js @@ -44,7 +44,8 @@ AJAX.registerOnload('db_tracking.js', function () { e.preventDefault(); var $button = $(this); var $form = $button.parent('form'); - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val(); + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); if ($button.val() == 'delete_tracking') { var question = PMA_messages.strDeleteTrackingDataMultiple; @@ -67,7 +68,8 @@ AJAX.registerOnload('db_tracking.js', function () { e.preventDefault(); var $button = $(this); var $form = $button.parent('form'); - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val(); + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); PMA_ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); @@ -91,4 +93,4 @@ AJAX.registerOnload('db_tracking.js', function () { $.post(url, params, AJAX.responseHandler); }); }); -}); \ No newline at end of file +}); diff --git a/js/functions.js b/js/functions.js index 07dd31d54f..5c1e640a19 100644 --- a/js/functions.js +++ b/js/functions.js @@ -218,7 +218,7 @@ function PMA_handleRedirectAndReload(data) { if (window.location.href.indexOf('?') === -1) { window.location.href += '?session_expired=1'; } else { - window.location.href += '&session_expired=1'; + window.location.href += PMA_commonParams.get('arg_separator') + 'session_expired=1'; } window.location.reload(); } else if (parseInt(data.reload_flag) == 1) { @@ -663,7 +663,7 @@ function confirmLink(theLink, theSqlQuery) var is_confirmed = confirm(PMA_sprintf(PMA_messages.strDoYouReally, theSqlQuery)); if (is_confirmed) { if (typeof(theLink.href) !== 'undefined') { - theLink.href += '&is_js_confirmed=1'; + theLink.href += PMA_commonParams.get('arg_separator') + 'is_js_confirmed=1'; } else if (typeof(theLink.form) != 'undefined') { theLink.form.action += '?is_js_confirmed=1'; } @@ -1844,16 +1844,17 @@ function loadForeignKeyCheckbox() { function getJSConfirmCommonParam (elem, params) { var $elem = $(elem); + var sep = PMA_commonParams.get('arg_separator'); if (params) { // Strip possible leading ? if (params.startsWith('?')) { params = params.substr(1); } - params += '&'; + params += sep; } else { params = ''; } - params += 'is_js_confirmed=1&ajax_request=true&fk_checks' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0); + params += 'is_js_confirmed=1' + sep + 'ajax_request=true' + sep 'fk_checks' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0); return params; } @@ -2408,10 +2409,11 @@ function PMA_ajaxRemoveMessage($this_msgbox) function PMA_previewSQL($form) { var form_url = $form.attr('action'); + var sep = PMA_commonParams.get('arg_separator'); var form_data = $form.serialize() + - '&do_save_data=1' + - '&preview_sql=1' + - '&ajax_request=1'; + sep + 'do_save_data=1' + + sep + 'preview_sql=1' + + sep + 'ajax_request=1'; var $msgbox = PMA_ajaxShowMessage(); $.ajax({ type: 'POST', @@ -2463,7 +2465,7 @@ function PMA_checkReservedWordColumns($form) { $.ajax({ type: 'POST', url: "tbl_structure.php", - data: $form.serialize() + '&reserved_word_check=1', + data: $form.serialize() + PMA_commonParams.get('arg_separator') + 'reserved_word_check=1', success: function (data) { if (typeof data.success != 'undefined' && data.success === true) { is_confirmed = confirm(data.message); @@ -2897,7 +2899,7 @@ AJAX.registerOnload('functions.js', function () { if (PMA_checkReservedWordColumns($form)) { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); //User wants to submit the form - $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) { + $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + "do_save_data=1", function (data) { if (typeof data !== 'undefined' && data.success === true) { $('#properties_message') .removeClass('error') @@ -2956,13 +2958,14 @@ AJAX.registerOnload('functions.js', function () { //Refresh navigation as a new table has been added PMA_reloadNavigation(); // Redirect to table structure page on creation of new table - var params_12 = 'ajax_request=true&ajax_page_request=true'; + var sep = PMA_commonParams.get('arg_separator'); + var params_12 = 'ajax_request=true' + sep + 'ajax_page_request=true'; if (! (history && history.pushState)) { params_12 += PMA_MicroHistory.menus.getRequestParam(); } tblStruct_url = 'tbl_structure.php?server=' + data._params.server + - '&db='+ data._params.db + '&token=' + data._params.token + - '&goto=db_structure.php&table=' + data._params.table + ''; + sep + 'db='+ data._params.db + sep + 'token=' + data._params.token + + sep + 'goto=db_structure.php' + sep 'table=' + data._params.table + ''; $.get(tblStruct_url, params_12, AJAX.responseHandler); } else { PMA_ajaxShowMessage( @@ -3205,7 +3208,7 @@ AJAX.registerOnload('functions.js', function () { var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); $the_form.append(''); - $.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) { + $.post($the_form.attr('action'), $the_form.serialize() + PMA_commonParams.get('arg_separator') + 'change_pw=' + this_value, function (data) { if (typeof data === 'undefined' || data.success !== true) { PMA_ajaxShowMessage(data.error, false); return; @@ -3813,7 +3816,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure) var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); PMA_prepareForAjaxRequest($form); //User wants to submit the form - $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) { + $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + "do_save_data=1", function (data) { var $sqlqueryresults = $(".sqlqueryresults"); if ($sqlqueryresults.length !== 0) { $sqlqueryresults.remove(); @@ -4626,7 +4629,8 @@ function PMA_createViewDialog($this) { var $msg = PMA_ajaxShowMessage(); var syntaxHighlighter = null; - $.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) { + var sep = PMA_commonParams.get('arg_separator'); + $.get($this.attr('href') + sep + 'ajax_request=1' + sep 'ajax_dialog=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); var buttonOptions = {}; diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 5591e124ce..2bafbcd874 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -199,7 +199,8 @@ function insertDataAndClose() { var $form = $('form#gis_data_editor_form'); var input_name = $form.find("input[name='input_name']").val(); - $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post('gis_data_editor.php', $form.serialize() + argsep + "generate=true" + argsep + "ajax_request=true", function (data) { if (typeof data !== 'undefined' && data.success === true) { $("input[name='" + input_name + "']").val(data.result); } else { @@ -246,7 +247,8 @@ AJAX.registerOnload('gis_data_editor.js', function () { */ $(document).on('change', "#gis_editor input[type='text']", function () { var $form = $('form#gis_data_editor_form'); - $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post('gis_data_editor.php', $form.serialize() + argsep + "generate=true" + argsep + "ajax_request=true", function (data) { if (typeof data !== 'undefined' && data.success === true) { $('#gis_data_textarea').val(data.result); $('#placeholder').empty().removeClass('hasSVG').html(data.visualization); @@ -267,7 +269,8 @@ AJAX.registerOnload('gis_data_editor.js', function () { var $gis_editor = $("#gis_editor"); var $form = $('form#gis_data_editor_form'); - $.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true&ajax_request=true", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post('gis_data_editor.php', $form.serialize() + argsep + "get_gis_editor=true" + argsep + "ajax_request=true", function (data) { if (typeof data !== 'undefined' && data.success === true) { $gis_editor.html(data.gis_editor); initGISEditorVisualization(); diff --git a/js/indexes.js b/js/indexes.js index 0bb91f7835..3a555f48d5 100644 --- a/js/indexes.js +++ b/js/indexes.js @@ -566,7 +566,8 @@ AJAX.registerOnload('indexes.js', function () { $(document).on('click', '#save_index_frm', function (event) { event.preventDefault(); var $form = $("#index_frm"); - var submitData = $form.serialize() + '&do_save_data=1&ajax_request=true&ajax_page_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'do_save_data=1' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); @@ -677,7 +678,7 @@ AJAX.registerOnload('indexes.js', function () { } title = PMA_messages.strEditIndex; } - url += "&ajax_request=true"; + url += PMA_commonParams.get('arg_separator') + "ajax_request=true"; indexEditorDialog(url, title, function () { // refresh the page using ajax PMA_commonActions.refreshMain(false, function () { diff --git a/js/microhistory.js b/js/microhistory.js index 5091b884b5..ec2c894f0f 100644 --- a/js/microhistory.js +++ b/js/microhistory.js @@ -199,7 +199,7 @@ PMA_MicroHistory = { } var menuHashesParam = menuHashes.join('-'); if (menuHashesParam) { - param = '&menuHashes=' + menuHashesParam; + param = PMA_commonParams.get('arg_separator') + 'menuHashes=' + menuHashesParam; } return param; }, diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index c4946a9ba2..e04b3d2b39 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -30,7 +30,7 @@ function removeColumnFromMultiSort(target, parent) { var URL = captureURL(target); var begin = target.indexOf('ORDER+BY') + 8; - var end = target.indexOf('&session_max_rows'); + var end = target.indexOf(PMA_commonParams.get('arg_separator') + 'session_max_rows'); // get the names of the columns involved var between_part = target.substr(begin, end-begin); var columns = between_part.split('%2C+'); @@ -49,7 +49,7 @@ function removeColumnFromMultiSort(target, parent) URL.head = head; // removing the last sort order should have priority over what // is remembered via the RememberSorting directive - URL.tail += '&discard_remembered_sort=1'; + URL.tail += PMA_commonParams.get('arg_separator') + 'discard_remembered_sort=1'; } var middle_part = columns.join('%2C+'); url = URL.head + middle_part + URL.tail; diff --git a/js/navigation.js b/js/navigation.js index a16605d4f0..3b1aabaa29 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -189,7 +189,7 @@ function loadChildNodes(isNode, $expandElem, callback) { if (window.location.href.indexOf('?') === -1) { window.location.href += '?session_expired=1'; } else { - window.location.href += '&session_expired=1'; + window.location.href += PMA_commonParams.get('arg_separator') + 'session_expired=1'; } window.location.reload(); } else { @@ -496,7 +496,7 @@ $(function () { event.preventDefault(); var url = $(this).attr('href').substr( $(this).attr('href').indexOf('?') + 1 - ) + '&ajax_request=true'; + ) + PMA_commonParams.get('arg_separator') + 'ajax_request=true'; var title = PMA_messages.strAddIndex; indexEditorDialog(url, title); }); @@ -506,7 +506,7 @@ $(function () { event.preventDefault(); var url = $(this).attr('href').substr( $(this).attr('href').indexOf('?') + 1 - ) + '&ajax_request=true'; + ) + PMA_commonParams.get('arg_separator') + 'ajax_request=true'; var title = PMA_messages.strEditIndex; indexEditorDialog(url, title); }); @@ -526,7 +526,7 @@ $(function () { server: PMA_commonParams.get('server'), token: PMA_commonParams.get('token') }, - url: $(this).attr('href') + '&ajax_request=true', + url: $(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=true', success: function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_reloadNavigation(); @@ -541,7 +541,7 @@ $(function () { $(document).on('click', 'a.showUnhide.ajax', function (event) { event.preventDefault(); var $msg = PMA_ajaxShowMessage(); - $.get($(this).attr('href') + '&ajax_request=1', function (data) { + $.get($(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); var buttonOptions = {}; @@ -578,7 +578,7 @@ $(function () { server: PMA_commonParams.get('server'), token: PMA_commonParams.get('token') }, - url: $(this).attr('href') + '&ajax_request=true', + url: $(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=true', success: function (data) { PMA_ajaxRemoveMessage($msg); if (typeof data !== 'undefined' && data.success === true) { @@ -1042,21 +1042,21 @@ function PMA_navigationTreePagination($this) { var url, params; if ($this[0].tagName == 'A') { url = $this.attr('href'); - params = 'ajax_request=true&token=' + PMA_commonParams.get('token'); + params = 'ajax_request=true' + PMA_commonParams.get('arg_separator') + 'token=' + PMA_commonParams.get('token'); } else { // tagName == 'SELECT' url = 'navigation.php'; - params = $this.closest("form").serialize() + '&ajax_request=true'; + params = $this.closest("form").serialize() + PMA_commonParams.get('arg_separator') + 'ajax_request=true'; } var searchClause = PMA_fastFilter.getSearchClause(); if (searchClause) { - params += '&searchClause=' + encodeURIComponent(searchClause); + params += PMA_commonParams.get('arg_separator') + 'searchClause=' + encodeURIComponent(searchClause); } if (isDbSelector) { - params += '&full=true'; + params += PMA_commonParams.get('arg_separator') + 'full=true'; } else { var searchClause2 = PMA_fastFilter.getSearchClause2($this); if (searchClause2) { - params += '&searchClause2=' + encodeURIComponent(searchClause2); + params += PMA_commonParams.get('arg_separator') + 'searchClause2=' + encodeURIComponent(searchClause2); } } $.post(url, params, function (data) { @@ -1548,7 +1548,7 @@ PMA_fastFilter.filter.prototype.request = function () { if (self.$this.find('> ul > li > form.fast_filter:first input[name=searchClause]').length === 0) { var $input = $('#pma_navigation_tree').find('li.fast_filter.db_fast_filter input.searchClause'); if ($input.length && $input.val() != $input[0].defaultValue) { - params += '&searchClause=' + encodeURIComponent($input.val()); + params += PMA_commonParams.get('arg_separator') + 'searchClause=' + encodeURIComponent($input.val()); } } self.xhr = $.ajax({ diff --git a/js/normalization.js b/js/normalization.js index f9484c6dbc..caa7f11906 100644 --- a/js/normalization.js +++ b/js/normalization.js @@ -522,8 +522,9 @@ AJAX.registerOnload('normalization.js', function() { $("#newCols #field_0_1").focus(); return false; } + var argsep = PMA_commonParams.get('arg_separator'); datastring = $('#newCols :input').serialize(); - datastring += "&ajax_request=1&do_save_data=1&field_where=last"; + datastring += argsep + "ajax_request=1" + argsep + "do_save_data=1" + argsep + "field_where=last"; $.post("tbl_addfield.php", datastring, function(data) { if (data.success) { $.post( @@ -582,7 +583,8 @@ AJAX.registerOnload('normalization.js', function() { }); $(".tblFooters").on("click", "#saveNewPrimary", function() { var datastring = $('#newCols :input').serialize(); - datastring += "&field_key[0]=primary_0&ajax_request=1&do_save_data=1&field_where=last"; + var argsep = PMA_commonParams.get('arg_separator'); + datastring += argsep + "field_key[0]=primary_0" + argsep + "ajax_request=1" + argsep + "do_save_data=1" + argsep + "field_where=last"; $.post("tbl_addfield.php", datastring, function(data) { if (data.success === true) { $("#mainContent h4").html(PMA_messages.strPrimaryKeyAdded); diff --git a/js/pmd/move.js b/js/pmd/move.js index e8bcc85c88..32c10f92f6 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -617,11 +617,12 @@ function Get_url_pos(forceString) { if (pmd_tables_enabled || forceString) { var poststr = ''; + var argsep = PMA_commonParams.get('arg_separator'); for (var key in j_tabs) { - poststr += '&t_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10); - poststr += '&t_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10); - poststr += '&t_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1); - poststr += '&t_h[' + key + ']=' + (document.getElementById('check_vis_' + key).checked ? 1 : 0); + poststr += argsep + 't_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10); + poststr += argsep + 't_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10); + poststr += argsep + 't_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1); + poststr += argsep + 't_h[' + key + ']=' + (document.getElementById('check_vis_' + key).checked ? 1 : 0); } return poststr; } else { @@ -641,8 +642,9 @@ function Get_url_pos(forceString) function Save2(callback) { if (pmd_tables_enabled) { - var poststr = '&operation=savePage&save_page=same&ajax_request=true'; - poststr += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + '&selected_page=' + selected_page; + var argsep = PMA_commonParams.get('arg_separator'); + var poststr = argsep + 'operation=savePage' + argsep + 'save_page=same' + argsep + 'ajax_request=true'; + poststr += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'token=' + PMA_commonParams.get('token') + argsep + 'selected_page=' + selected_page; poststr += Get_url_pos(); var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); @@ -774,7 +776,8 @@ function Edit_pages() }; var $msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=true&dialog=edit&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=true' + argsep + 'dialog=edit' + argsep + 'server=' + server + argsep + 'token=' + PMA_commonParams.get('token') + argsep + 'db=' + db; $.get("db_designer.php", params, function (data) { if (data.success === false) { PMA_ajaxShowMessage(data.error, false); @@ -854,7 +857,8 @@ function Delete_pages() }; var $msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=true&dialog=delete&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=true' + argsep + 'dialog=delete' + argsep + 'server=' + server + argsep + 'token=' + PMA_commonParams.get('token') + argsep + 'db=' + db; $.get("db_designer.php", params, function (data) { if (data.success === false) { PMA_ajaxShowMessage(data.error, false); @@ -953,7 +957,8 @@ function Save_as() }; var $msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=true' + argsep + 'dialog=save_as' + argsep + 'server=' + server + argsep + 'token=' + PMA_commonParams.get('token') + argsep + 'db=' + db; $.get("db_designer.php", params, function (data) { if (data.success === false) { PMA_ajaxShowMessage(data.error, false); @@ -1030,7 +1035,8 @@ function Export_pages() $(this).dialog('close'); }; var $msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=true&dialog=export&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db + '&selected_page=' + selected_page; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=true' + argsep + 'dialog=export' + argsep + 'server=' + server + argsep + 'token=' + PMA_commonParams.get('token') + argsep + 'db=' + db + argsep + 'selected_page=' + selected_page; $.get("db_designer.php", params, function (data) { if (data.success === false) { PMA_ajaxShowMessage(data.error, false); @@ -1041,7 +1047,7 @@ function Export_pages() if (!pmd_tables_enabled) { $form.append(''); } - $.each(Get_url_pos(true).substring(1).split('&'), function() { + $.each(Get_url_pos(true).substring(1).split(argsep), function() { var pair = this.split('='); var input = $(''); input.attr('name', pair[0]); @@ -1074,10 +1080,11 @@ function Export_pages() function Load_page(page) { if (pmd_tables_enabled) { var param_page = ''; + var argsep = PMA_commonParams.get('arg_separator'); if (page !== null) { - param_page = '&page=' + page; + param_page = argsep + 'page=' + page; } - $('') + $('') .appendTo($('#page_content')) .click(); } else { @@ -1158,6 +1165,7 @@ function Start_relation() function Click_field(T, f, PK) // table field { PK = parseInt(PK); + var argsep = PMA_commonParams.get('arg_separator'); if (ON_relation) { if (!click_field) { //.style.display=='none' .style.display = 'none' @@ -1169,7 +1177,7 @@ function Click_field(T, f, PK) // table field document.getElementById('foreign_relation').style.display = 'none'; } click_field = 1; - link_relation = "T1=" + T + "&F1=" + f; + link_relation = 'T1=' + T + argsep + 'F1=' + f; document.getElementById('pmd_hint').innerHTML = PMA_messages.strSelectForeignKey; } else { Start_relation(); // hidden hint... @@ -1181,7 +1189,7 @@ function Click_field(T, f, PK) // table field var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight; document.getElementById('layer_new_relation').style.top = top + 'px'; document.getElementById('layer_new_relation').style.display = 'block'; - link_relation += '&T2=' + T + '&F2=' + f; + link_relation += argsep + 'T2=' + T + argsep + 'F2=' + f; } } @@ -1220,9 +1228,10 @@ function Click_field(T, f, PK) // table field function New_relation() { document.getElementById('layer_new_relation').style.display = 'none'; - link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token'); - link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; - link_relation += '&operation=addNewRelation&ajax_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + link_relation += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'token=' + PMA_commonParams.get('token'); + link_relation += argsep + 'on_delete=' + document.getElementById('on_delete').value + argsep + 'on_update=' + document.getElementById('on_update').value; + link_relation += argsep + 'operation=addNewRelation' + argsep + 'ajax_request=true'; var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); $.post('db_designer.php', link_relation, function (data) { @@ -1444,15 +1453,17 @@ function Canvas_click(id, event) var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10; document.getElementById('layer_upd_relation').style.top = top + 'px'; document.getElementById('layer_upd_relation').style.display = 'block'; - link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key; + var argsep = PMA_commonParams.get('arg_separator'); + link_relation = 'T1=' + Key0 + argsep + 'F1=' + Key1 + argsep + 'T2=' + Key2 + argsep + 'F2=' + Key3 + argsep + 'K=' + Key; } } function Upd_relation() { document.getElementById('layer_upd_relation').style.display = 'none'; - link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token'); - link_relation += '&operation=removeRelation&ajax_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + link_relation += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'token=' + PMA_commonParams.get('token'); + link_relation += argsep + 'operation=removeRelation' + argsep + 'ajax_request=true'; var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); $.post('db_designer.php', link_relation, function (data) { diff --git a/js/server_databases.js b/js/server_databases.js index ec0faf05f9..d73a5d0d2e 100644 --- a/js/server_databases.js +++ b/js/server_databases.js @@ -57,10 +57,11 @@ AJAX.registerOnload('server_databases.js', function () { var question = PMA_messages.strDropDatabaseStrongWarning + ' ' + PMA_sprintf(PMA_messages.strDoYouReally, selected_dbs.join('
')); + var argsep = PMA_commonParams.get('arg_separator'); $(this).PMA_confirm( question, $form.prop('action') + '?' + $(this).serialize() + - '&drop_selected_dbs=1&is_js_confirmed=1&ajax_request=true', + argsep + 'drop_selected_dbs=1' + argsep + 'is_js_confirmed=1' + argsep + 'ajax_request=true', function (url) { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false); @@ -124,7 +125,7 @@ AJAX.registerOnload('server_databases.js', function () { // make ajax request to load db structure page - taken from ajax.js var dbStruct_url = data.url_query; dbStruct_url = dbStruct_url.replace(/amp;/ig, ''); - var params = 'ajax_request=true&ajax_page_request=true'; + var params = 'ajax_request=true' + PMA_commonParams.get('arg_separator') + 'ajax_page_request=true'; if (! (history && history.pushState)) { params += PMA_MicroHistory.menus.getRequestParam(); } diff --git a/js/server_privileges.js b/js/server_privileges.js index 74461300da..dc8355f3c6 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -177,7 +177,8 @@ AJAX.registerOnload('server_privileges.js', function () { PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers); - $.post(url, $form.serialize() + "&delete=" + $thisButton.val() + "&ajax_request=true", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post(url, $form.serialize() + argsep + 'delete=' + $thisButton.val() + argsep + 'ajax_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxShowMessage(data.message); // Refresh navigation, if we droppped some databases with the name @@ -236,9 +237,10 @@ AJAX.registerOnload('server_privileges.js', function () { .find('select[name="userGroup"]') .val(); var $message = PMA_ajaxShowMessage(); + var argsep = PMA_commonParams.get('arg_separator'); $.post( 'server_privileges.php', - $('#changeUserGroupDialog').find('form').serialize() + '&ajax_request=1', + $('#changeUserGroupDialog').find('form').serialize() + argsep + 'ajax_request=1', function (data) { PMA_ajaxRemoveMessage($message); if (typeof data !== 'undefined' && data.success === true) { @@ -302,9 +304,10 @@ AJAX.registerOnload('server_privileges.js', function () { button_options[PMA_messages.strClose] = function () { $(this).dialog("close"); }; + var argsep = PMA_commonParams.get('arg_separator'); $.post( $(this.form).prop('action'), - $(this.form).serialize() + '&submit_mult=export&ajax_request=true', + $(this.form).serialize() + argsep + 'submit_mult=export' + argsep + 'ajax_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { var $ajaxDialog = $('
') diff --git a/js/sql.js b/js/sql.js index 57b0c185fa..4f49e9ce46 100644 --- a/js/sql.js +++ b/js/sql.js @@ -168,10 +168,11 @@ AJAX.registerOnload('sql.js', function () { var $link = $(this); $link.PMA_confirm(question, $link.attr('href'), function (url) { $msgbox = PMA_ajaxShowMessage(); - var params = 'ajax_request=1&is_js_confirmed=1'; + var argsep = PMA_commonParams.get('arg_separator'); + var params = 'ajax_request=1' + argsep + 'is_js_confirmed=1'; var postData = $link.getPostData(); if (postData) { - params += '&' + postData; + params += argsep + postData; } $.post(url, params, function (data) { if (data.success) { @@ -188,7 +189,8 @@ AJAX.registerOnload('sql.js', function () { $(document).on('submit', '.bookmarkQueryForm', function (e) { e.preventDefault(); PMA_ajaxShowMessage(); - $.post($(this).attr('action'), 'ajax_request=1&' + $(this).serialize(), function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post($(this).attr('action'), 'ajax_request=1' + argsep + $(this).serialize(), function (data) { if (data.success) { PMA_ajaxShowMessage(data.message); } else { @@ -457,7 +459,8 @@ AJAX.registerOnload('sql.js', function () { PMA_prepareForAjaxRequest($form); - $.post($form.attr('action'), $form.serialize() + '&ajax_page_request=true', function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post($form.attr('action'), $form.serialize() + argsep + 'ajax_page_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { // success happens if the query returns rows or not @@ -569,7 +572,8 @@ AJAX.registerOnload('sql.js', function () { $form = $(this); var $msgbox = PMA_ajaxShowMessage(); - $.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post($form.attr('action'), $form.serialize() + argsep + 'ajax_request=true', function (data) { PMA_ajaxRemoveMessage($msgbox); var $sqlqueryresults = $form.parents(".sqlqueryresults"); $sqlqueryresults @@ -620,7 +624,8 @@ AJAX.registerOnload('sql.js', function () { } function submitShowAllForm() { - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; PMA_ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); @@ -720,7 +725,8 @@ AJAX.registerOnload('sql.js', function () { e.preventDefault(); var $button = $(this); var $form = $button.closest('form'); - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val(); + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); PMA_ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); diff --git a/js/tbl_operations.js b/js/tbl_operations.js index 3783058e40..77912818f4 100644 --- a/js/tbl_operations.js +++ b/js/tbl_operations.js @@ -24,7 +24,8 @@ AJAX.registerOnload('tbl_operations.js', function () { event.preventDefault(); var $form = $(this); PMA_prepareForAjaxRequest($form); - $.post($form.attr('action'), $form.serialize() + "&submit_copy=Go", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post($form.attr('action'), $form.serialize() + argsep + 'submit_copy=Go', function (data) { if (typeof data !== 'undefined' && data.success === true) { if ($form.find("input[name='switch_to_new']").prop('checked')) { PMA_commonParams.set( @@ -56,7 +57,8 @@ AJAX.registerOnload('tbl_operations.js', function () { event.preventDefault(); var $form = $(this); PMA_prepareForAjaxRequest($form); - $.post($form.attr('action'), $form.serialize() + "&submit_move=1", function (data) { + var argsep = PMA_commonParams.get('arg_separator'); + $.post($form.attr('action'), $form.serialize() + argsep + 'submit_move=1', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_commonParams.set('db', data._params.db); PMA_commonParams.set('table', data._params.tbl); @@ -143,7 +145,7 @@ AJAX.registerOnload('tbl_operations.js', function () { }); var postData = $link.getPostData(); if (postData) { - params += '&' + postData; + params += PMA_commonParams.get('arg_separator') + postData; } $.post($link.attr('href'), params, function (data) { @@ -193,7 +195,8 @@ AJAX.registerOnload('tbl_operations.js', function () { var $form = $(this); function submitPartitionMaintenance() { - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true'; + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); diff --git a/js/tbl_relation.js b/js/tbl_relation.js index 8f09c0f8e1..14a13d38da 100644 --- a/js/tbl_relation.js +++ b/js/tbl_relation.js @@ -69,18 +69,19 @@ function getDropdownValues($dropdown) { } var $msgbox = PMA_ajaxShowMessage(); var $form = $dropdown.parents('form'); - var url = 'tbl_relation.php?getDropdownValues=true&ajax_request=true' + - '&token=' + $form.find('input[name="token"]').val() + - '&db=' + $form.find('input[name="db"]').val() + - '&table=' + $form.find('input[name="table"]').val() + - '&foreign=' + (foreign !== '') + - '&foreignDb=' + encodeURIComponent(foreignDb) + + var argsep = PMA_commonParams.get('arg_separator'); + var url = 'tbl_relation.php?getDropdownValues=true' + argsep + 'ajax_request=true' + + argsep + 'token=' + $form.find('input[name="token"]').val() + + argsep + 'db=' + $form.find('input[name="db"]').val() + + argsep + 'table=' + $form.find('input[name="table"]').val() + + argsep + 'foreign=' + (foreign !== '') + + argsep + 'foreignDb=' + encodeURIComponent(foreignDb) + (foreignTable !== null ? - '&foreignTable=' + encodeURIComponent(foreignTable) : '' + argsep + 'foreignTable=' + encodeURIComponent(foreignTable) : '' ); var $server = $form.find('input[name="server"]'); if ($server.length > 0) { - url += '&server=' + $form.find('input[name="server"]').val(); + url += argsep + 'server=' + $form.find('input[name="server"]').val(); } $.ajax({ url: url, diff --git a/js/tbl_structure.js b/js/tbl_structure.js index d66c1141ff..b0131a667a 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -54,7 +54,7 @@ function PMA_tbl_structure_menu_resizer_callback() { * Reload fields table */ function reloadFieldForm() { - $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize() + "&ajax_request=true", function (form_data) { + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize() + PMA_commonParams.get('arg_separator') + "ajax_request=true", function (form_data) { var $temp_div = $("
").append(form_data.message); $("#fieldsForm").replaceWith($temp_div.find("#fieldsForm")); $("#addColumns").replaceWith($temp_div.find("#addColumns")); @@ -112,7 +112,7 @@ AJAX.registerOnload('tbl_structure.js', function () { function submitForm(){ $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); - $.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) { + $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + 'do_save_data=1', function (data) { if ($(".sqlqueryresults").length !== 0) { $(".sqlqueryresults").remove(); } else if ($(".error:not(.tab)").length !== 0) { @@ -215,7 +215,7 @@ AJAX.registerOnload('tbl_structure.js', function () { $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) { var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false); var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); - params += '&ajax_page_request=1'; + params += PMA_commonParams.get('arg_separator') + 'ajax_page_request=1'; $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); @@ -301,7 +301,7 @@ AJAX.registerOnload('tbl_structure.js', function () { AJAX.source = $this; var params = getJSConfirmCommonParam(this, $this_anchor.getPostData()); - params += '&ajax_page_request=1'; + params += PMA_commonParams.get('arg_separator') + 'ajax_page_request=1'; $.post(url, params, AJAX.responseHandler); }); // end $.PMA_confirm() }); //end Add key @@ -336,7 +336,7 @@ AJAX.registerOnload('tbl_structure.js', function () { return; } - $.post($form.prop("action"), serialized + "&ajax_request=true", function (data) { + $.post($form.prop("action"), serialized + PMA_commonParams.get('arg_separator') + "ajax_request=true", function (data) { if (data.success === false) { PMA_ajaxRemoveMessage($msgbox); $this @@ -443,7 +443,8 @@ AJAX.registerOnload('tbl_structure.js', function () { e.preventDefault(); var $button = $(this); var $form = $button.parents('form'); - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val(); + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); PMA_ajaxShowMessage(); AJAX.source = $form; $.post($form.attr('action'), submitData, AJAX.responseHandler); diff --git a/js/tbl_tracking.js b/js/tbl_tracking.js index c037917d93..8df7e85edf 100644 --- a/js/tbl_tracking.js +++ b/js/tbl_tracking.js @@ -54,7 +54,8 @@ AJAX.registerOnload('tbl_tracking.js', function () { e.preventDefault(); var $button = $(this); var $form = $button.parent('form'); - var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val(); + var argsep = PMA_commonParams.get('arg_separator'); + var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val(); if ($button.val() == 'delete_version') { var question = PMA_messages.strDeleteTrackingVersionMultiple; @@ -107,4 +108,4 @@ AJAX.registerOnload('tbl_tracking.js', function () { $.post(url, params, AJAX.responseHandler); }); }); -}); \ No newline at end of file +}); diff --git a/libraries/Header.php b/libraries/Header.php index d85b84606c..a06ddeb2a2 100644 --- a/libraries/Header.php +++ b/libraries/Header.php @@ -246,7 +246,8 @@ class Header 'LoginCookieValidity' => $GLOBALS['cfg']['LoginCookieValidity'], 'session_gc_maxlifetime' => (int)@ini_get('session.gc_maxlifetime'), 'logged_in' => isset($GLOBALS['userlink']) ? true : false, - 'PMA_VERSION' => PMA_VERSION + 'PMA_VERSION' => PMA_VERSION, + 'arg_separator' => URL::getArgSeparator(), ); if (isset($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['auth_type']) From c9153ed21a8b0625b846700ec19540c5671029c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 1 Mar 2018 15:50:25 +0100 Subject: [PATCH 2/2] Changelog for #14036 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b54960072b..2923a3e609 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.7.9 (not yet released) - issue #13940 Honor arg_separator in AJAX requests +- issue #13931 Fixed browsing tables with more results 4.7.8 (2018-02-20) - issue #13914 Fixed resetting default setting values.