
<!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>[12883] trunk/wp-admin/network.php:

  block multisite enable on localhost and ip address, see #11816</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12883">12883</a></dd>

<dt>Author</dt> <dd>wpmuguru</dd>

<dt>Date</dt> <dd>2010-01-27 22:10:41 +0000 (Wed, 27 Jan 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>block multisite enable on localhost and ip address, see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminnetworkphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (12882 => 12883)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/network.php        2010-01-27 21:29:07 UTC (rev 12882)

+++ trunk/wp-admin/network.php        2010-01-27 22:10:41 UTC (rev 12883)

</span><span class="lines">@@ -150,6 +150,9 @@

</span><span class="cx">         $weblog_title = sprintf( __( '%s Sites' ), ucfirst( get_option( 'blogname' ) ) );

</span><span class="cx">         $email = get_option( 'admin_email' );

</span><span class="cx">         $hostname = get_clean_basedomain();

</span><ins>+        $invalid_host = false;

+        if ( 'localhost' == $hostname || preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname, $match ) )

+                $invalid_host = true;

</ins><span class="cx">         if ( substr( $hostname, 0, 4 ) == 'www.' )

</span><span class="cx">                 $nowww = substr( $hostname, 4 );

</span><span class="cx"> 

</span><span class="lines">@@ -174,9 +177,12 @@

</span><span class="cx">                         &lt;tr&gt;

</span><span class="cx">                                 &lt;th scope='row'&gt;&lt;?php esc_html_e( 'Server Address' ); ?&gt;&lt;/th&gt;

</span><span class="cx">                                 &lt;td&gt;

</span><ins>+                &lt;?php if ( !$invalid_host ) { ?&gt;

</ins><span class="cx">                                         &lt;p&gt;&lt;?php printf( __( 'This will be the Internet address of your site: &lt;strong&gt;&lt;em&gt;%s&lt;/em&gt;&lt;/strong&gt;.' ), $hostname ); ?&gt;&lt;/p&gt;

</span><span class="cx">                                         &lt;input type='hidden' name='basedomain' value='&lt;?php echo esc_attr( $hostname ); ?&gt;' /&gt;

</span><ins>+                &lt;?php } else { ?&gt;

</ins><span class="cx">                                         &lt;p&gt;&lt;?php _e( 'Do not use an IP address (like 127.0.0.1) or a single word hostname like &lt;q&gt;localhost&lt;/q&gt; as your server address.' ); ?&gt;&lt;/p&gt;

</span><ins>+                &lt;?php } ?&gt;

</ins><span class="cx">                                 &lt;/td&gt;

</span><span class="cx">                         &lt;/tr&gt;

</span><span class="cx">                 &lt;/table&gt;

</span><span class="lines">@@ -198,7 +204,9 @@

</span><span class="cx">                                 &lt;/td&gt;

</span><span class="cx">                         &lt;/tr&gt;

</span><span class="cx">                 &lt;/table&gt;

</span><ins>+                &lt;?php if ( !$invalid_host ) { ?&gt;

</ins><span class="cx">                 &lt;p class='submit'&gt;&lt;input class=&quot;button&quot; name='submit' type='submit' value='&lt;?php esc_attr_e( 'Proceed' ); ?&gt;' /&gt;&lt;/p&gt;

</span><ins>+                &lt;?php } ?&gt;

</ins><span class="cx">         &lt;?php

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre>

</div>

</div>


</body>

</html>