X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/48ab98cb1779cf2088c1351ac3dd3d0da6fb31d3..e3ff8f35458a959c1879c0a4976701ed8dcfe651:/wp-login.php
diff --git a/wp-login.php b/wp-login.php
index b9dbd61e..4e189d86 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -25,7 +25,8 @@ if ( force_ssl_admin() && ! is_ssl() ) {
/**
* Output the login page header.
*
- * @param string $title Optional. WordPress Log In Page title to display in element. Default 'Log In'.
+ * @param string $title Optional. WordPress login Page title to display in the `<title>` element.
+ * Default 'Log In'.
* @param string $message Optional. Message to display in header. Default empty.
* @param WP_Error $wp_error Optional. The error to pass. Default empty.
*/
@@ -35,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();
@@ -44,7 +44,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
// Shake it!
$shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
/**
- * Filter the error codes array for shaking the login form.
+ * Filters the error codes array for shaking the login form.
*
* @since 3.0.0
*
@@ -55,6 +55,8 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
add_action( 'login_head', 'wp_shake_js', 12 );
+ $separator = is_rtl() ? ' › ' : ' ‹ ';
+
?><!DOCTYPE html>
<!--[if IE 8]>
<html xmlns="http://www.w3.org/1999/xhtml" class="ie8" <?php language_attributes(); ?>>
@@ -64,10 +66,10 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
<!--<![endif]-->
<head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
- <title><?php bloginfo('name'); ?> › <?php echo $title; ?>
+ <?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?>
site_name;
+ $login_header_title = get_network()->site_name;
} else {
$login_header_url = __( 'https://wordpress.org/' );
$login_header_title = __( 'Powered by WordPress' );
}
/**
- * Filter link URL of the header logo above login form.
+ * Filters link URL of the header logo above login form.
*
* @since 2.1.0
*
* @param string $login_header_url Login header logo URL.
*/
$login_header_url = apply_filters( 'login_headerurl', $login_header_url );
+
/**
- * Filter the title attribute of the header logo above login form.
+ * Filters the title attribute of the header logo above login form.
*
* @since 2.1.0
*
@@ -119,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 ) {
@@ -135,7 +137,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
$classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
/**
- * Filter the login page body classes.
+ * Filters the login page body classes.
*
* @since 3.5.0
*
@@ -147,6 +149,14 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
?>
+
@@ -240,9 +253,10 @@ function login_footer($input_id = '') {