Changeset 34213

Timestamp:

09/15/2015 05:10:24 PM (11 years ago)

Author:

johnbillion

Message:

Implement wp_login_url() and wp_registration_url() in places where wp-login.php is currently hard-coded.

See #31495
Props GregLone

Location:

trunk/src

Files:

• wp-activate.php (modified) (1 diff)
• wp-admin/includes/network.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)
• wp-signup.php (modified) (2 diffs)

trunk/src/wp-activate.php

@@ -15 +15 @@
 
 if ( !is_multisite() ) {
-        wp_redirect( site_url( '/wp-login.php?action=register' ) );
+        wp_redirect( wp_registration_url() );
         die();
 }

trunk/src/wp-admin/includes/network.php

@@ -495 +495 @@
 
         if ( !is_multisite() ) { ?>
-                <p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( site_url( 'wp-login.php' ) ); ?>"><?php _e( 'Log In' ); ?></a></p>
+                <p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
 <?php
         }

trunk/src/wp-includes/canonical.php

@@ -327 +327 @@
                                 $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();
                         }
 
@@ -592 +592 @@
         );
         if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
-                wp_redirect( site_url( 'wp-login.php', 'login' ) );
+                wp_redirect( wp_login_url() );
                 exit;
         }

trunk/src/wp-includes/general-template.php

@@ -448 +448 @@
 
         $form = '
-                <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
+                <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( wp_login_url() ) . '" method="post">
                         ' . $login_form_top . '
                         <p class="login-username">

trunk/src/wp-login.php

@@ -743 +743 @@
 ?>
 
-<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() ); ?>" method="post" novalidate="novalidate">
         <p>
                 <label for="user_login"><?php _e('Username') ?><br />
@@ -909 +909 @@
 ?>
 
-<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
+<form name="loginform" id="loginform" action="<?php echo esc_url( wp_login_url() ); ?>" method="post">
         <p>
                 <label for="user_login"><?php _e('Username') ?><br />

trunk/src/wp-signup.php

@@ -29 +29 @@
 
 if ( !is_multisite() ) {
-        wp_redirect( site_url('wp-login.php?action=register') );
+        wp_redirect( wp_registration_url() );
         die();
 }
@@ -670 +670 @@
         _e( 'Registration has been disabled.' );
 } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
-        $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) );
+        $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
         echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
 } else {