WordPress.org

Make WordPress Core

Changeset 21813


Ignore:
Timestamp:
09/11/2012 12:27:25 PM (9 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ms.php

    r21801 r21813  
    675675        <tr>
    676676            <th scope="row" colspan="2" class="th-full">
    677                 <a href="<?php echo apply_filters( 'wp_signup_location', network_home_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
     677                <a href="<?php echo apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
    678678            </th>
    679679        </tr>
  • trunk/wp-includes/canonical.php

    r21217 r21813  
    1919 *
    2020 * Prevents redirection for feeds, trackbacks, searches, comment popup, and
    21  * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7, 
     21 * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
    2222 * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
    2323 * requests.
     
    283283        if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
    284284            if ( is_multisite() )
    285                 $redirect_url = apply_filters( 'wp_signup_location', site_url( 'wp-signup.php' ) );
     285                $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
    286286            else
    287287                $redirect_url = site_url( 'wp-login.php?action=register' );
  • trunk/wp-login.php

    r21664 r21813  
    510510    if ( is_multisite() ) {
    511511        // Multisite uses wp-signup.php
    512         wp_redirect( apply_filters( 'wp_signup_location', site_url('wp-signup.php') ) );
     512        wp_redirect( apply_filters( 'wp_signup_location', network_site_url('wp-signup.php') ) );
    513513        exit;
    514514    }
  • trunk/wp-signup.php

    r21664 r21813  
    2424
    2525if ( !is_main_site() ) {
    26     wp_redirect( network_home_url( 'wp-signup.php' ) );
     26    wp_redirect( network_site_url( 'wp-signup.php' ) );
    2727    die();
    2828}
     
    391391    _e( 'Registration has been disabled.' );
    392392} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
    393     $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ) ) );
     393    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) );
    394394    echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
    395395} else {
Note: See TracChangeset for help on using the changeset viewer.