Changeset 21813

Timestamp:

09/11/2012 12:27:25 PM (12 years ago)

Author:

nacin

Message:

Use network_site_url() for wp-signup.php. props markjaquith. see #19796.

Location:

trunk

Files:

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

trunk/wp-admin/includes/ms.php

@@ -675 +675 @@
         <tr>
             <th scope="row" colspan="2" class="th-full">
-                <a href="<?php echo apply_filters( 'wp_signup_location', network_home_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
+                <a href="<?php echo apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
             </th>
         </tr>

trunk/wp-includes/canonical.php

@@ -19 +19 @@
  *
  * Prevents redirection for feeds, trackbacks, searches, comment popup, and
- * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7, 
+ * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
  * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
  * requests.
@@ -283 +283 @@
         if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
             if ( is_multisite() )
-                $redirect_url = apply_filters( 'wp_signup_location', site_url( 'wp-signup.php' ) );
+                $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
             else
                 $redirect_url = site_url( 'wp-login.php?action=register' );

trunk/wp-login.php

@@ -510 +510 @@
     if ( is_multisite() ) {
         // Multisite uses wp-signup.php
-        wp_redirect( apply_filters( 'wp_signup_location', site_url('wp-signup.php') ) );
+        wp_redirect( apply_filters( 'wp_signup_location', network_site_url('wp-signup.php') ) );
         exit;
     }

trunk/wp-signup.php

@@ -24 +24 @@
 
 if ( !is_main_site() ) {
-    wp_redirect( network_home_url( 'wp-signup.php' ) );
+    wp_redirect( network_site_url( 'wp-signup.php' ) );
     die();
 }
@@ -391 +391 @@
     _e( 'Registration has been disabled.' );
 } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
-    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ) ) );
+    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( 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 {