Changeset 28215

Timestamp:

04/25/2014 07:11:32 AM (11 years ago)

Author:

DrewAPicture

Message:

Clean up duplicate hook notations and adjacency for calls to the wp_signup_location filter.

Also adds braces missed in [25535].

See #26869.

Location:

trunk/src

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

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

@@ -671 +671 @@
             <th scope="row" colspan="2" class="th-full">
                 <?php
-                $signup_url = network_site_url( 'wp-signup.php' );
                 /** This filter is documented in wp-login.php */
+                $sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
                 ?>
-                <a href="<?php echo apply_filters( 'wp_signup_location', $signup_url ); ?>"><?php _e( 'Create a New Site' ); ?></a>
+                <a href="<?php echo esc_url( $sign_up_url ); ?>"><?php _e( 'Create a New Site' ); ?></a>
             </th>
         </tr>

trunk/src/wp-includes/canonical.php

@@ -296 +296 @@
 
         if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
-            if ( is_multisite() )
+            if ( is_multisite() ) {
                 /** This filter is documented in wp-login.php */
                 $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
-            else
+            } else {
                 $redirect_url = site_url( 'wp-login.php?action=register' );
+            }
+
             wp_redirect( $redirect_url, 301 );
             die();

trunk/src/wp-login.php

@@ -644 +644 @@
 case 'register' :
     if ( is_multisite() ) {
-        $sign_up_url = network_site_url( 'wp-signup.php' );
         /**
          * Filter the Multisite sign up URL.
@@ -652 +651 @@
          * @param string $sign_up_url The sign up URL.
          */
-        wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) );
+        wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
         exit;
     }