<!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>[12777] trunk/wp-admin/options-network.php:
make server address in network settings a label, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12777">12777</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-20 20:42:20 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>make server address in network settings a label, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsnetworkphp">trunk/wp-admin/options-network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-network.php (12776 => 12777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-network.php 2010-01-20 20:09:41 UTC (rev 12776)
+++ trunk/wp-admin/options-network.php 2010-01-20 20:42:20 UTC (rev 12777)
</span><span class="lines">@@ -151,9 +151,9 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope='row'>Server Address</th>
</span><span class="cx"> <td>
</span><del>- <p>What is the Internet address of your site? You should enter the shortest address possible. For example, use <em>example.com</em> instead of <em>www.example.com</em> but if you are going to use an address like <em>blogs.example.com</em> then enter that unaltered in the box below.</p>
- <input type='text' name='basedomain' value='<?php echo $hostname ?>' />
- <p>Do not use an IP address (like 127.0.0.1) or a single word hostname like <q>localhost</q> as your server address, use <q>localhost.localdomain</q> instead.</p>
</del><ins>+ <p>This will be the Internet address of your site: <strong><em><?php echo $hostname; ?></em></strong>.</p>
+ <input type='hidden' name='basedomain' value='<?php echo $hostname ?>' />
+ <p>Do not use an IP address (like 127.0.0.1) or a single word hostname like <q>localhost</q> as your server address.</p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -262,8 +262,8 @@
</span><span class="cx">
</span><span class="cx"> function get_clean_basedomain() {
</span><span class="cx"> global $wpdb;
</span><del>- $domain = $wpdb->escape( $_POST[ 'basedomain' ] );
- $domain = str_replace( 'http://', '', $domain );
</del><ins>+ $domain = preg_replace( '|https?://|', '', get_option( 'siteurl') );
+ //@todo: address no www in multisite code
</ins><span class="cx"> if( substr( $domain, 0, 4 ) == 'www.' )
</span><span class="cx"> $domain = substr( $domain, 4 );
</span><span class="cx"> if( strpos( $domain, '/' ) )
</span><span class="lines">@@ -308,14 +308,11 @@
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx"> // create network tables
</span><del>- $_SERVER[ 'HTTP_HOST' ] = str_replace( 'www.', '', $_SERVER[ 'HTTP_HOST' ] ); // normalise hostname - no www.
</del><ins>+ $domain = get_clean_basedomain();
</ins><span class="cx"> install_network();
</span><del>- populate_network( 1, $_SERVER[ 'HTTP_HOST' ], sanitize_email( $_POST[ 'email' ] ), $_POST[ 'weblog_title' ], $base, $_POST[ 'vhost' ] );
</del><ins>+ populate_network( 1, $domain, sanitize_email( $_POST[ 'email' ] ), $_POST[ 'weblog_title' ], $base, $_POST[ 'vhost' ] );
</ins><span class="cx"> // create wp-config.php / htaccess
</span><span class="cx"> step2();
</span><del>-//continue;
-
-// step3();
</del><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> //@todo: give an informative screen instead
</span></span></pre>
</div>
</div>
</body>
</html>