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

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-06-26 10:34:56 +02:00
commit a3edd0b7dd
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
4.4.11.0 (not yet released)
- bug Missing selected/entered values when editing active options in visual query builder
- bug #4969 Autoload from prefs_storage not behaving properly
4.4.10.0 (2015-06-17)
- bug #4950 Issues in database selection for replication

2
js/console.js
View File

@ -173,7 +173,7 @@ var PMA_console = {
PMA_console.ajaxCallback(data);
} catch (e) {
console.log("Invalid JSON!" + e.message);
if(AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
if(AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
PMA_ajaxShowMessage($('<div />',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'}));
AJAX.active = false;
AJAX.xhr = null;

2
libraries/user_preferences.lib.php
View File

@ -279,7 +279,7 @@ function PMA_userprefsAutoloadGetHeader()
);
$retval .= '<div id="prefs_autoload" class="notice" style="display:none">';
$retval .= '<form action="prefs_manage.php" method="post">';
$retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">';
$retval .= PMA_URL_getHiddenInputs();
$retval .= '<input type="hidden" name="json" value="" />';
$retval .= '<input type="hidden" name="submit_import" value="1" />';