WordPress 4.7

[autoinstalls/wordpress.git] / wp-login.php

diff --git a/wp-login.php b/wp-login.php
index 01c754f00de1b127f83c024c38397e2386d92dfe..4e189d86b043c8bbeaf12ff3d704075db7d6c0bc 100644 (file)
--- a/wp-login.php
+++ b/wp-login.php
@@ -36,8 +36,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
        // Don't index any of these forms
        add_action( 'login_head', 'wp_no_robots' );
 
-       if ( wp_is_mobile() )
-               add_action( 'login_head', 'wp_login_viewport_meta' );
+       add_action( 'login_head', 'wp_login_viewport_meta' );
 
        if ( empty($wp_error) )
                $wp_error = new WP_Error();
@@ -99,7 +98,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 
        if ( is_multisite() ) {
                $login_header_url   = network_home_url();
-               $login_header_title = get_current_site()->site_name;
+               $login_header_title = get_network()->site_name;
        } else {
                $login_header_url   = __( 'https://wordpress.org/' );
                $login_header_title = __( 'Powered by WordPress' );
@@ -124,8 +123,6 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
        $login_header_title = apply_filters( 'login_headertitle', $login_header_title );
 
        $classes = array( 'login-action-' . $action, 'wp-core-ui' );
-       if ( wp_is_mobile() )
-               $classes[] = 'mobile';
        if ( is_rtl() )
                $classes[] = 'rtl';
        if ( $interim_login ) {
@@ -260,8 +257,6 @@ function login_footer($input_id = '') {
  * @since 3.0.0
  */
 function wp_shake_js() {
-       if ( wp_is_mobile() )
-               return;
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
@@ -285,14 +280,9 @@ function wp_login_viewport_meta() {
 /**
  * Handles sending password retrieval email to user.
  *
- * @global wpdb         $wpdb      WordPress database abstraction object.
- * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
- *
  * @return bool|WP_Error True: when finish. WP_Error on error
  */
 function retrieve_password() {
-       global $wpdb, $wp_hasher;
-
        $errors = new WP_Error();
 
        if ( empty( $_POST['user_login'] ) ) {
@@ -341,15 +331,17 @@ function retrieve_password() {
        $message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
        $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
-       if ( is_multisite() )
-               $blogname = $GLOBALS['current_site']->site_name;
-       else
+       if ( is_multisite() ) {
+               $blogname = get_network()->site_name;
+       } else {
                /*
                 * The blogname option is escaped with esc_html on the way into the database
                 * in sanitize_option we want to reverse this for the plain text arena of emails.
                 */
                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+       }
 
+       /* translators: Password reset email subject. 1: Site name */
        $title = sprintf( __('[%s] Password Reset'), $blogname );
 
        /**
@@ -431,7 +423,7 @@ do_action( 'login_init' );
  *
  * @since 2.8.0
  */
-do_action( 'login_form_' . $action );
+do_action( "login_form_{$action}" );
 
 $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
 $interim_login = isset($_REQUEST['interim-login']);
@@ -444,7 +436,6 @@ case 'postpass' :
                exit();
        }
 
-       require_once ABSPATH . WPINC . '/class-phpass.php';
        $hasher = new PasswordHash( 8, true );
 
        /**
@@ -541,7 +532,7 @@ case 'retrievepassword' :
 
 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
        <p>
-               <label for="user_login" ><?php _e('Username or Email') ?><br />
+               <label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
                <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
        </p>
        <?php
@@ -797,10 +788,12 @@ default:
 
        if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
                if ( headers_sent() ) {
+                       /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
                        $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
                                __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
                } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
                        // If cookies are disabled we can't log in even with a valid user+pass
+                       /* translators: 1: Browser cookie documentation URL */
                        $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
                                __( 'https://codex.wordpress.org/Cookies' ) ) );
                }
@@ -903,11 +896,11 @@ default:
 
 <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
        <p>
-               <label for="user_login"><?php _e('Username or Email') ?><br />
+               <label for="user_login"><?php _e( 'Username or Email Address' ); ?><br />
                <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
        </p>
        <p>
-               <label for="user_pass"><?php _e('Password') ?><br />
+               <label for="user_pass"><?php _e( 'Password' ); ?><br />
                <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
        </p>
        <?php
@@ -918,7 +911,7 @@ default:
         */
        do_action( 'login_form' );
        ?>
-       <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
+       <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
        <p class="submit">
                <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" />
 <?php  if ( $interim_login ) { ?>