Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2014-10-28 15:14:45 +0300
committerMarc Delisle <marc@infomarc.info>2014-10-28 15:14:45 +0300
commit90ee48f0bab4b6c473a6c7e60456771dc1a7c8d3 (patch)
treee6b5c84e84cb3096b27ef804a53e4ac6052d7940 /js
parent5d62fcbf78f8d40f12a1599858d4395d99deaf58 (diff)
parentddbcb5165a11af0c359c7427793e642809b91bdf (diff)
Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
RFE 1550: PMA_URL_getCommon(): new style
Diffstat (limited to 'js')
-rw-r--r--js/db_search.js2
-rw-r--r--js/server_status_monitor.js12
-rw-r--r--js/server_status_processes.js2
3 files changed, 8 insertions, 8 deletions
diff --git a/js/db_search.js b/js/db_search.js
index d1351b5ee0..a25b8296d2 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -43,7 +43,7 @@ function loadResult(result_path, table_name, link)
$('#togglequerybox').hide();
/** Load the browse results to the page */
$("#table-info").show();
- $('#table-link').attr({"href" : 'sql.php?' + link }).text(table_name);
+ $('#table-link').attr({"href" : 'sql.php' + link }).text(table_name);
var url = result_path + "#sqlqueryresults";
$.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
if (typeof data !== 'undefined' && data.success) {
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index a082089e7d..6e61d8b3fa 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -572,7 +572,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$('<form />', {
"class": "disableAjax",
method: "post",
- action: "file_echo.php?" + PMA_commonParams.get('common_query') + "&filename=1",
+ action: "file_echo.php" + PMA_commonParams.get('common_query') + "&filename=1",
style: "display:none;"
})
.append(
@@ -590,7 +590,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$('a[href="#importMonitorConfig"]').click(function (event) {
event.preventDefault();
$('#emptyDialog').dialog({title: PMA_messages.strImportDialogTitle});
- $('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php?' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
+ $('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
'<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
var dlgBtns = {};
@@ -697,7 +697,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$.extend(vars, getvars);
}
- $.get('server_status_monitor.php?' + PMA_commonParams.get('common_query'), vars,
+ $.get('server_status_monitor.php' + PMA_commonParams.get('common_query'), vars,
function (data) {
var logVars;
if (typeof data !== 'undefined' && data.success === true) {
@@ -1353,7 +1353,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
/* Called in regular intervalls, this function updates the values of each chart in the grid */
function refreshChartGrid() {
/* Send to server */
- runtime.refreshRequest = $.post('server_status_monitor.php?' + PMA_commonParams.get('common_query'), {
+ runtime.refreshRequest = $.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
ajax_request: true,
chart_data: 1,
type: 'chartgrid',
@@ -1592,7 +1592,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
});
- logRequest = $.get('server_status_monitor.php?' + PMA_commonParams.get('common_query'),
+ logRequest = $.get('server_status_monitor.php' + PMA_commonParams.get('common_query'),
{ ajax_request: true,
log_data: 1,
type: opts.src,
@@ -1986,7 +1986,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
PMA_messages.strAnalyzing + ' <img class="ajaxIcon" src="' +
pmaThemeImage + 'ajax_clock_small.gif" alt="">');
- $.post('server_status_monitor.php?' + PMA_commonParams.get('common_query'), {
+ $.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
ajax_request: true,
query_analyzer: true,
query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),
diff --git a/js/server_status_processes.js b/js/server_status_processes.js
index 72b9bfbbf5..2777ad64e7 100644
--- a/js/server_status_processes.js
+++ b/js/server_status_processes.js
@@ -28,7 +28,7 @@ var processList = {
init: function() {
processList.setRefreshLabel();
if (processList.refreshUrl === null) {
- processList.refreshUrl = 'server_status_processes.php?' +
+ processList.refreshUrl = 'server_status_processes.php' +
PMA_commonParams.get('common_query');
}
if (processList.refreshInterval === null) {