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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-03-23 07:52:04 +01:00
commit c3aa2431f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ajax.js
View File

@ -163,11 +163,11 @@ var AJAX = {
// Add a list of menu hashes that we have in the cache to the request
params += AJAX.cache.menus.getRequestParam();
this._debug && console.log("Loading: " + url); // no need to translate
AJAX._debug && console.log("Loading: " + url); // no need to translate
if (isLink) {
AJAX.active = true;
this.$msgbox = PMA_ajaxShowMessage();
AJAX.$msgbox = PMA_ajaxShowMessage();
$.get(url, params, AJAX.responseHandler);
} else {
/**
@ -180,7 +180,7 @@ var AJAX = {
// or if it returns a value that evaluates to true
if (typeof onsubmit !== 'function' || onsubmit.apply(this, [event])) {
AJAX.active = true;
this.$msgbox = PMA_ajaxShowMessage();
AJAX.$msgbox = PMA_ajaxShowMessage();
$.post(url, params, AJAX.responseHandler);
}
}

2
sql.php
View File

@ -1298,7 +1298,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
. '&id_bookmark=1';
echo '<form action="sql.php" method="post"'
. ' onsubmit="return emptyFormElements(this, \'fields[label]\');"'
. ' onsubmit="return ! emptyFormElements(this, \'fields[label]\');"'
. ' id="bookmarkQueryForm">';
echo PMA_generate_common_hidden_inputs();
echo '<input type="hidden" name="goto" value="' . $goto . '" />';