diff options
Diffstat (limited to 'plugins/jetpack/modules/sso')
| -rw-r--r-- | plugins/jetpack/modules/sso/class.jetpack-sso-helpers.php | 2 | ||||
| -rw-r--r-- | plugins/jetpack/modules/sso/jetpack-sso-login.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/jetpack/modules/sso/class.jetpack-sso-helpers.php b/plugins/jetpack/modules/sso/class.jetpack-sso-helpers.php index 307e3786..1bb0cb18 100644 --- a/plugins/jetpack/modules/sso/class.jetpack-sso-helpers.php +++ b/plugins/jetpack/modules/sso/class.jetpack-sso-helpers.php @@ -192,7 +192,7 @@ class Jetpack_SSO_Helpers { $hosts[] = 'public-api.wordpress.com'; if ( false === strpos( $api_base, 'jetpack.wordpress.com/jetpack' ) ) { - $base_url_parts = parse_url( esc_url_raw( $api_base ) ); + $base_url_parts = wp_parse_url( esc_url_raw( $api_base ) ); if ( $base_url_parts && ! empty( $base_url_parts[ 'host' ] ) ) { $hosts[] = $base_url_parts[ 'host' ]; } diff --git a/plugins/jetpack/modules/sso/jetpack-sso-login.js b/plugins/jetpack/modules/sso/jetpack-sso-login.js index a37feeb5..18080f8a 100644 --- a/plugins/jetpack/modules/sso/jetpack-sso-login.js +++ b/plugins/jetpack/modules/sso/jetpack-sso-login.js @@ -2,6 +2,7 @@ jQuery( document ).ready( function( $ ) { var body = $( 'body' ), toggleSSO = $( '.jetpack-sso-toggle' ), userLogin = $( '#user_login' ), + userPassword = $( '#user_pass' ), ssoWrap = $( '#jetpack-sso-wrap' ), loginForm = $( '#loginform' ), overflow = $( '<div class="jetpack-sso-clear"></div>' ); @@ -27,6 +28,7 @@ jQuery( document ).ready( function( $ ) { body.toggleClass( 'jetpack-sso-form-display' ); if ( ! body.hasClass( 'jetpack-sso-form-display' ) ) { userLogin.focus(); + userPassword.prop( 'disabled', false ); } } ); } ); |