<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15050] trunk: strip www before adding subdomain when creating new site</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15050">15050</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-29 00:32:10 +0000 (Sat, 29 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>strip www before adding subdomain when creating new site</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-05-28 23:04:00 UTC (rev 15049)
+++ trunk/wp-admin/ms-edit.php 2010-05-29 00:32:10 UTC (rev 15050)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> wp_die( __( 'Invalid email address.' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><del>- $newdomain = $domain . '.' . $current_site->domain;
</del><ins>+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
</ins><span class="cx"> $path = $base;
</span><span class="cx"> } else {
</span><span class="cx"> $newdomain = $current_site->domain;
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-05-28 23:04:00 UTC (rev 15049)
+++ trunk/wp-admin/ms-sites.php 2010-05-29 00:32:10 UTC (rev 15050)
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Site Address' ) ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <?php if ( is_subdomain_install() ) { ?>
</span><del>- <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo $current_site->domain;?>
</del><ins>+ <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
</ins><span class="cx"> <?php } else {
</span><span class="cx"> echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php _e( 'Domain' ) ?>"/>
</span><span class="cx"> <?php }
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-05-28 23:04:00 UTC (rev 15049)
+++ trunk/wp-includes/ms-functions.php 2010-05-29 00:32:10 UTC (rev 15050)
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> // Check if the domain/path has been used already.
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><del>- $mydomain = "$blogname.$domain";
</del><ins>+ $mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
</ins><span class="cx"> $path = $base;
</span><span class="cx"> } else {
</span><span class="cx"> $mydomain = "$domain";
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-05-28 23:04:00 UTC (rev 15049)
+++ trunk/wp-signup.php 2010-05-29 00:32:10 UTC (rev 15050)
</span><span class="lines">@@ -78,15 +78,15 @@
</span><span class="cx"> if ( !is_subdomain_install() )
</span><span class="cx"> echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
</span><span class="cx"> else
</span><del>- echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . '</span><br />';
</del><ins>+ echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
</ins><span class="cx">
</span><span class="cx"> if ( !is_user_logged_in() ) {
</span><span class="cx"> print '(<strong>' . __( 'Your address will be ' );
</span><span class="cx"> if ( !is_subdomain_install() )
</span><span class="cx"> print $current_site->domain . $current_site->path . __( 'sitename' );
</span><span class="cx"> else
</span><del>- print __( 'domain.' ) . $current_site->domain . $current_site->path;
- echo '.)</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
</del><ins>+ print __( 'domain.' ) . $site_domain . $current_site->path;
+ echo '.</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Blog Title
</span></span></pre>
</div>
</div>
</body>
</html>