WordPress.org

Make WordPress Core

Changeset 28215


Ignore:
Timestamp:
04/25/2014 07:11:32 AM (4 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:
3 edited

Legend:

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

    r27801 r28215  
    671671            <th scope="row" colspan="2" class="th-full">
    672672                <?php
    673                 $signup_url = network_site_url( 'wp-signup.php' );
    674673                /** This filter is documented in wp-login.php */
     674                $sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
    675675                ?>
    676                 <a href="<?php echo apply_filters( 'wp_signup_location', $signup_url ); ?>"><?php _e( 'Create a New Site' ); ?></a>
     676                <a href="<?php echo esc_url( $sign_up_url ); ?>"><?php _e( 'Create a New Site' ); ?></a>
    677677            </th>
    678678        </tr>
  • trunk/src/wp-includes/canonical.php

    r26868 r28215  
    296296
    297297        if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
    298             if ( is_multisite() )
     298            if ( is_multisite() ) {
    299299                /** This filter is documented in wp-login.php */
    300300                $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
    301             else
     301            } else {
    302302                $redirect_url = site_url( 'wp-login.php?action=register' );
     303            }
     304
    303305            wp_redirect( $redirect_url, 301 );
    304306            die();
  • trunk/src/wp-login.php

    r28208 r28215  
    644644case 'register' :
    645645    if ( is_multisite() ) {
    646         $sign_up_url = network_site_url( 'wp-signup.php' );
    647646        /**
    648647         * Filter the Multisite sign up URL.
     
    652651         * @param string $sign_up_url The sign up URL.
    653652         */
    654         wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) );
     653        wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
    655654        exit;
    656655    }
Note: See TracChangeset for help on using the changeset viewer.