<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21813] trunk: Use network_site_url() for wp-signup.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21813">21813</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-11 12:27:25 +0000 (Tue, 11 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use network_site_url() for wp-signup.php. props markjaquith. see <a href="http://core.trac.wordpress.org/ticket/19796">#19796</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (21812 => 21813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-09-11 02:12:34 UTC (rev 21812)
+++ trunk/wp-admin/includes/ms.php 2012-09-11 12:27:25 UTC (rev 21813)
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx"> <?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row" colspan="2" class="th-full">
</span><del>- <a href="<?php echo apply_filters( 'wp_signup_location', network_home_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
</del><ins>+ <a href="<?php echo apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
</ins><span class="cx"> </th>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (21812 => 21813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2012-09-11 02:12:34 UTC (rev 21812)
+++ trunk/wp-includes/canonical.php 2012-09-11 12:27:25 UTC (rev 21813)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> * one or the other.
</span><span class="cx"> *
</span><span class="cx"> * Prevents redirection for feeds, trackbacks, searches, comment popup, and
</span><del>- * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
</del><ins>+ * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
</ins><span class="cx"> * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
</span><span class="cx"> * requests.
</span><span class="cx"> *
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
</span><span class="cx"> if ( is_multisite() )
</span><del>- $redirect_url = apply_filters( 'wp_signup_location', site_url( 'wp-signup.php' ) );
</del><ins>+ $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
</ins><span class="cx"> else
</span><span class="cx"> $redirect_url = site_url( 'wp-login.php?action=register' );
</span><span class="cx"> wp_redirect( $redirect_url, 301 );
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (21812 => 21813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2012-09-11 02:12:34 UTC (rev 21812)
+++ trunk/wp-login.php 2012-09-11 12:27:25 UTC (rev 21813)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> case 'register' :
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> // Multisite uses wp-signup.php
</span><del>- wp_redirect( apply_filters( 'wp_signup_location', site_url('wp-signup.php') ) );
</del><ins>+ wp_redirect( apply_filters( 'wp_signup_location', network_site_url('wp-signup.php') ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (21812 => 21813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2012-09-11 02:12:34 UTC (rev 21812)
+++ trunk/wp-signup.php 2012-09-11 12:27:25 UTC (rev 21813)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_main_site() ) {
</span><del>- wp_redirect( network_home_url( 'wp-signup.php' ) );
</del><ins>+ wp_redirect( network_site_url( 'wp-signup.php' ) );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> if ( $active_signup == 'none' ) {
</span><span class="cx"> _e( 'Registration has been disabled.' );
</span><span class="cx"> } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
</span><del>- $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ) ) );
</del><ins>+ $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) );
</ins><span class="cx"> echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
</span><span class="cx"> } else {
</span><span class="cx"> $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
</span></span></pre>
</div>
</div>
</body>
</html>