Ticket #23087: patch.diff

wp-activate.php

@@ -14 +14 @@
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
 if ( !is_multisite() ) {
-        wp_redirect( site_url( '/wp-login.php?action=register' ) );
+        wp_redirect( wp_registration_url() );
         die();
 }
 

wp-includes/canonical.php

@@ -326 +326 @@
                                 /** This filter is documented in wp-login.php */
                                 $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
                         } else {
-                                $redirect_url = site_url( 'wp-login.php?action=register' );
+                                $redirect_url = wp_registration_url();
                         }
 
                         wp_redirect( $redirect_url, 301 );

wp-includes/general-template.php

@@ -357 +357 @@
  * Returns the URL that allows the user to register on the site.
  *
  * @since 3.6.0
+ * @since 4.4.0 The `$scheme` parameter was added.
  *
  * @return string User registration URL.
  */
-function wp_registration_url() {
+function wp_registration_url( $scheme = null ) {
         /**
          * Filter the user registration URL.
          *
@@ -368 +369 @@
          *
          * @param string $register The user registration URL.
          */
-        return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', 'login' ) );
+        return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', $scheme ) );
 }
 
 /**
@@ -515 +516 @@
 function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
         if ( ! is_user_logged_in() ) {
                 if ( get_option('users_can_register') )
-                        $link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+                        $link = $before . '<a href="' . esc_url( wp_registration_url( 'login' ) ) . '">' . __('Register') . '</a>' . $after;
                 else
                         $link = '';
         } else {

wp-login.php

@@ -578 +578 @@
 <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' ) );
+        $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url( 'login' ) ), __( 'Register' ) );
 
         /** This filter is documented in wp-includes/general-template.php */
         echo ' | ' . apply_filters( 'register', $registration_url );
@@ -687 +687 @@
 <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' ) );
+        $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url( 'login' ) ), __( 'Register' ) );
 
         /** This filter is documented in wp-includes/general-template.php */
         echo ' | ' . apply_filters( 'register', $registration_url );
@@ -742 +742 @@
         login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
 ?>
 
-<form name="registerform" id="registerform" action="<?php echo esc_url( site_url('wp-login.php?action=register', 'login_post') ); ?>" method="post" novalidate="novalidate">
+<form name="registerform" id="registerform" action="<?php echo esc_url( wp_registration_url( 'login_post' ) ); ?>" method="post" novalidate="novalidate">
         <p>
                 <label for="user_login"><?php _e('Username') ?><br />
                 <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
@@ -944 +944 @@
 <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' ) );
+                $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url( 'login' ) ), __( 'Register' ) );
 
                 /** This filter is documented in wp-includes/general-template.php */
                 echo apply_filters( 'register', $registration_url ) . ' | ';

wp-signup.php

@@ -28 +28 @@
 add_action( 'wp_head', 'do_signup_header' );
 
 if ( !is_multisite() ) {
-        wp_redirect( site_url('wp-login.php?action=register') );
+        wp_redirect( wp_registration_url() );
         die();
 }