Ticket #41514: 41514.2.patch

src/wp-login.php

@@ -956 +956 @@
 
 <?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' ) ) :
+        <?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 );
+                echo apply_filters( 'register', $registration_url ) . ' | ';
+        }
 
-                echo esc_html( $login_link_separator );
-        endif;
+        if ( ! isset( $_GET['checkemail'] ) || 'newpass' !== $_GET['checkemail'] ) { 
+                printf( '<a href="%s">%s</a>', esc_url( wp_lostpassword_url() ), __( 'Lost your password?' ) ); 
+        }
         ?>
-        <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-<?php endif; ?>
-</p>
+</p> 
 <?php } ?>
 
 <script type="text/javascript">