Ticket #39929: 39929.1.diff

src/wp-login.php

@@ -25 +25 @@
 /**
  * Output the login page header.
  *
+ * @since 4.8.0
+ *
  * @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.
@@ -216 +218 @@
 } // End of login_header()
 
 /**
+ * Output the navigation links below the login form.
+ *
+ * @param string $action The action that brought the visitor to the login page.
+ *
+ * @return string The html code for the navigation links.
+ */
+function wp_login_form_nav_links( $action ) {
+        $nav_links = array();
+
+        // Add "Log In" link.
+        if ( in_array( $action, array( 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register' ) ) ) {
+                $nav_links[] = sprintf( '<a href="%s">%s</a>', esc_url( wp_login_url() ), __('Log in') );
+        }
+
+        // Add "Register" link.
+        if ( 'register' != $action ) {
+                if ( ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) && get_option( 'users_can_register' ) ) {
+                        $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+
+                        /** This filter is documented in wp-includes/general-template.php */
+                        $nav_links[] = apply_filters( 'register', $registration_url );
+                }
+        }
+
+        // Add "Lost Password" link.
+        if ( ! in_array( $action, array( 'lostpassword', 'retrievepassword', 'resetpass', 'rp' ) ) ) {
+                if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) {
+                        $nav_links[] = sprintf( '<a href="%s">%s</a>', esc_url( wp_lostpassword_url() ), __( 'Lost your password?' ) );
+                }
+        }
+
+        /**
+         * Filters the login form navigation links.
+         *
+         * @since 4.8.0
+         *
+         * @param array $nav_links Links to add to the navigation area below the
+         *                         login form.
+         * @param string $action   The action that brought the visitor to the
+         *                         login page.
+         */
+        $nav_links = apply_filters( 'wp_login_form_nav_links', $nav_links, $action );
+
+        /**
+         * Filters the characters used to join login form navigation links.
+         *
+         * @since 4.8.0
+         *
+         * @param string $join_string Default string used to concatenate links.
+         * @param string $action      The action that brought the visitor to the
+         *                            login page.
+         */
+        $nav_links_join = apply_filters( 'wp_login_form_nav_links_join', ' | ', $action );
+
+        echo implode( $nav_links_join, $nav_links );
+}
+
+/**
  * Outputs the footer for the login page.
  *
  * @param string $input_id Which input to auto-focus
@@ -358 +418 @@
 
         /**
          * Filters the message body of the password reset mail.
-         * 
+         *
          * If the filtered message is empty, the password reset email will not be sent.
          *
          * @since 2.8.0
@@ -549 +609 @@
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e('Log in') ?></a>
-<?php
-if ( get_option( 'users_can_register' ) ) :
-        $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-
-        /** This filter is documented in wp-includes/general-template.php */
-        echo ' | ' . apply_filters( 'register', $registration_url );
-endif;
-?>
+        <?php wp_login_form_nav_links( $action ); ?>
 </p>
 
 <?php
@@ -662 +714 @@
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-<?php
-if ( get_option( 'users_can_register' ) ) :
-        $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-
-        /** This filter is documented in wp-includes/general-template.php */
-        echo ' | ' . apply_filters( 'register', $registration_url );
-endif;
-?>
+        <?php wp_login_form_nav_links( $action ); ?>
 </p>
 
 <?php
@@ -743 +787 @@
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> |
-<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+        <?php wp_login_form_nav_links( $action ); ?>
 </p>
 
 <?php
@@ -930 +973 @@
 
 <?php if ( ! $interim_login ) { ?>
 <p id="nav">
-<?php if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
-        if ( get_option( 'users_can_register' ) ) :
-                $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-
-                /** This filter is documented in wp-includes/general-template.php */
-                echo apply_filters( 'register', $registration_url ) . ' | ';
-        endif;
-        ?>
-        <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-<?php endif; ?>
+        <?php wp_login_form_nav_links( $action ); ?>
 </p>
 <?php } ?>