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

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-02-02 14:07:04 +01:00
commit a67c153884
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
- issue #12923 Fixed server side search in navigation panel
- issue #12929 Undefined index warning with ssl_ca_paths
- issue #12924 Do not show errors from OpenSSL cookie encryption/decryption
- issue #12945 Fixed hint rendering on adding new user
4.6.6 (2017-01-23)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

1
js/console.js
View File

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

8
js/jquery/jquery-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/jquery/src/jquery-ui/widget.js vendored
View File

@ -502,7 +502,7 @@ $.Widget.prototype = {
for ( i = 0; i < classes.length; i++ ) {
current = that.classesElementLookup[ classes[ i ] ] || $();
if ( options.add ) {
current = $( $.unique( current.get().concat( options.element.get() ) ) );
current = $( $.uniqueSort( current.get().concat( options.element.get() ) ) );
} else {
current = $( current.not( options.element ).get() );
}

2
js/jquery/src/jquery-ui/widgets/controlgroup.js vendored
View File

@ -150,7 +150,7 @@ return $.widget( "ui.controlgroup", {
} );
} );
this.childWidgets = $( $.unique( childWidgets ) );
this.childWidgets = $( $.uniqueSort( childWidgets ) );
this._addClass( this.childWidgets, "ui-controlgroup-item" );
},

2
js/jquery/src/jquery-ui/widgets/tabs.js vendored
View File

@ -96,7 +96,7 @@ $.widget( "ui.tabs", {
// Take disabling tabs via class attribute from HTML
// into account and update option properly.
if ( $.isArray( options.disabled ) ) {
options.disabled = $.unique( options.disabled.concat(
options.disabled = $.uniqueSort( options.disabled.concat(
$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
return that.tabs.index( li );
} )

2
libraries/server_privileges.lib.php
View File

@ -1634,7 +1634,7 @@ function PMA_getHtmlForLoginInformationFields(
. $hostname_length . '" value="'
// use default value of '%' to match with the default 'Any host'
. htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '%')
. '" title="' . __('Host name')
. '" title="' . __('Host name') . '" '
. ((isset($GLOBALS['pred_hostname'])
&& $GLOBALS['pred_hostname'] == 'userdefined'
)