diff --git a/ChangeLog b/ChangeLog index ec3e65640a..0b8d7b1b5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/js/console.js b/js/console.js index 6523c770e3..3493f13d1d 100644 --- a/js/console.js +++ b/js/console.js @@ -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($('
',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'})); AJAX.active = false; AJAX.xhr = null; diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 33ddeabe40..c2fb9fb0f7 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -279,7 +279,7 @@ function PMA_userprefsAutoloadGetHeader() ); $retval .= '