Skip to content

Sync login_header() and login_footer() with WP 7.1 #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masteradhoc merged 2 commits into from
Aug 24, 2026
Merged

Sync login_header() and login_footer() with WP 7.1 #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fe63f
update wp-login to WP 7.1
masteradhoc Aug 21, 2026
89fdd6a
update to wp 7.1
masteradhoc Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 69 additions & 8 deletions includes/function.login-footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function login_footer( $input_id = '' ) {
)
);
/**
* Filter the "Go to site" link displayed in the login page footer.
* Filters the "Go to site" link displayed in the login page footer.
*
* @since 5.7.0
*
Expand All @@ -48,15 +48,81 @@ function login_footer( $input_id = '' ) {
?>
</div><?php // End of <div id="login">. ?>

<?php
if (
! $interim_login &&
/**
* Filters whether to display the Language selector on the login screen.
*
* @since 5.9.0
*
* @param bool $display Whether to display the Language selector on the login screen.
*/
apply_filters( 'login_display_language_dropdown', true )
) {
$languages = get_available_languages();

if ( ! empty( $languages ) ) {
?>
<div class="language-switcher">
<form id="language-switcher" method="get">

<label for="language-switcher-locales">
<?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span>
</label>

<?php
$args = array(
'id' => 'language-switcher-locales',
'name' => 'wp_lang',
'selected' => determine_locale(),
'show_available_translations' => false,
'explicit_option_en_us' => true,
'languages' => $languages,
);

/**
* Filters default arguments for the Language select input on the login screen.
*
* The arguments get passed to the wp_dropdown_languages() function.
*
* @since 5.9.0
*
* @param array $args Arguments for the Language select input on the login screen.
*/
wp_dropdown_languages( apply_filters( 'login_language_dropdown_args', $args ) );
?>

<?php if ( $interim_login ) { ?>
<input type="hidden" name="interim-login" value="1" />
<?php } ?>

<?php if ( isset( $_GET['redirect_to'] ) && '' !== $_GET['redirect_to'] ) { ?>
<input type="hidden" name="redirect_to" value="<?php echo sanitize_url( $_GET['redirect_to'] ); ?>" />
<?php } ?>

<?php if ( isset( $_GET['action'] ) && '' !== $_GET['action'] ) { ?>
<input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action'] ); ?>" />
<?php } ?>

<input type="submit" class="button" value="<?php esc_attr_e( 'Change' ); ?>">

</form>
</div>
<?php } ?>
<?php } ?>

<?php

if ( ! empty( $input_id ) ) {
ob_start();
?>
<script type="text/javascript">
<script>
try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
if(typeof wpOnload==='function')wpOnload();
</script>
<?php
wp_print_inline_script_tag( wp_remove_surrounding_empty_script_tags( ob_get_clean() ) );
}

/**
Expand All @@ -67,7 +133,6 @@ function login_footer( $input_id = '' ) {
do_action( 'login_footer' );

?>
<div class="clear"></div>
</body>
</html>
<?php
Expand All @@ -79,9 +144,5 @@ function login_footer( $input_id = '' ) {
* @since 3.0.0
*/
function wp_shake_js() {
?>
<script type="text/javascript">
document.querySelector('form').classList.add('shake');
</script>
<?php
wp_print_inline_script_tag( "document.querySelector('form').classList.add('shake');" );
}
100 changes: 73 additions & 27 deletions includes/function.login-header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/**
* Output the login page header.
* Outputs the login page header.
*
* @since 2.1.0
*
Expand All @@ -14,14 +14,18 @@
* upon successful login.
* @global string $action The action that brought the visitor to the login page.
*
* @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 is a WP_Error instance.
* @param string|null $title Optional. WordPress login page title to display in the `<title>` element.
* Defaults to 'Log In'.
* @param string $message Optional. Message to display in header. Default empty.
* @param WP_Error|null $wp_error Optional. The error to pass. Defaults to a WP_Error instance.
*/
function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
function login_header( $title = null, $message = '', $wp_error = null ) {
global $error, $interim_login, $action;

if ( null === $title ) {
$title = __( 'Log In' );
}

// Don't index any of these forms.
add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
add_action( 'login_head', 'wp_strict_cross_origin_referrer' );
Expand All @@ -39,7 +43,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
*
* @since 3.0.0
*
* @param array $shake_error_codes Error codes that shake the login form.
* @param string[] $shake_error_codes Error codes that shake the login form.
*/
$shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );

Expand Down Expand Up @@ -82,13 +86,15 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
* but maybe better if it's not removable by plugins.
*/
if ( 'loggedout' === $wp_error->get_error_code() ) {
ob_start();
?>
<script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
<?php
wp_print_inline_script_tag( wp_remove_surrounding_empty_script_tags( ob_get_clean() ) );
}

/**
* Enqueue scripts and styles for the login page.
* Enqueues scripts and styles for the login page.
*
* @since 3.1.0
*/
Expand Down Expand Up @@ -141,7 +147,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
*/
$login_header_text = apply_filters( 'login_headertext', $login_header_text );

$classes = array( 'login-action-' . $action, 'wp-core-ui' );
$classes = array( 'login-action-' . $action, 'wp-core-ui', 'admin-color-modern' );

if ( is_rtl() ) {
$classes[] = 'rtl';
Expand All @@ -151,43 +157,50 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
$classes[] = 'interim-login';

?>
<style type="text/css">html{background-color: transparent;}</style>
<style>html{background-color: transparent;}</style>
<?php

if ( 'success' === $interim_login ) {
$classes[] = 'interim-login-success';
}
}

$classes[] = ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
$classes[] = 'locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );

/**
* Filters the login page body classes.
*
* @since 3.5.0
*
* @param array $classes An array of body classes.
* @param string $action The action that brought the visitor to the login page.
* @param string[] $classes An array of body classes.
* @param string $action The action that brought the visitor to the login page.
*/
$classes = apply_filters( 'login_body_class', $classes, $action );

?>
</head>
<body class="login no-js <?php echo esc_attr( implode( ' ', $classes ) ); ?>">
<script type="text/javascript">
document.body.className = document.body.className.replace('no-js','js');
</script>
<?php
wp_print_inline_script_tag( "document.body.className = document.body.className.replace('no-js','js');" );
?>

<?php
/**
* Fires in the login page header after the body tag is opened.
*
* @since 4.6.0
*/
do_action( 'login_header' );

?>
<?php
if ( 'confirm_admin_email' !== $action && ! empty( $title ) ) :
?>
<h1 class="screen-reader-text"><?php echo $title; ?></h1>
<?php
endif;
?>
<div id="login">
<h1><a href="<?php echo esc_url( $login_header_url ); ?>"><?php echo $login_header_text; ?></a></h1>
<h1 role="presentation" class="wp-login-logo"><a href="<?php echo esc_url( $login_header_url ); ?>"><?php echo $login_header_text; ?></a></h1>
<?php
/**
* Filters the message to display above the login form.
Expand All @@ -209,29 +222,52 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
}

if ( $wp_error->has_errors() ) {
$errors = '';
$messages = '';
$error_list = array();
$messages = '';

foreach ( $wp_error->get_error_codes() as $code ) {
$severity = $wp_error->get_error_data( $code );
foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
if ( 'message' === $severity ) {
$messages .= ' ' . $error_message . "<br />\n";
$messages .= '<p>' . $error_message . '</p>';
} else {
$errors .= ' ' . $error_message . "<br />\n";
$error_list[] = $error_message;
}
}
}

if ( ! empty( $errors ) ) {
if ( ! empty( $error_list ) ) {
$errors = '';

if ( count( $error_list ) > 1 ) {
$errors .= '<ul class="login-error-list">';

foreach ( $error_list as $item ) {
$errors .= '<li>' . $item . '</li>';
}

$errors .= '</ul>';
} else {
$errors .= '<p>' . $error_list[0] . '</p>';
}

/**
* Filters the error messages displayed above the login form.
*
* @since 2.1.0
*
* @param string $errors Login error message.
* @param string $errors Login error messages.
*/
echo '<div id="login_error">' . apply_filters( 'login_errors', $errors ) . "</div>\n";
$errors = apply_filters( 'login_errors', $errors );

wp_admin_notice(
$errors,
array(
'type' => 'error',
'id' => 'login_error',
'paragraph_wrap' => false,
)
);
}

if ( ! empty( $messages ) ) {
Expand All @@ -242,7 +278,17 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
*
* @param string $messages Login messages.
*/
echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
$messages = apply_filters( 'login_messages', $messages );

wp_admin_notice(
$messages,
array(
'type' => 'info',
'id' => 'login-message',
'additional_classes' => array( 'message' ),
'paragraph_wrap' => false,
)
);
}
}
} // End of login_header().
Expand All @@ -254,6 +300,6 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
*/
function wp_login_viewport_meta() {
?>
<meta name="viewport" content="width=device-width" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<?php
}
Loading