<!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>[14884] trunk/wp-admin/network.php: Improved mayday calls in network.
php when a subdirectory install isn't allowed.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14884">14884</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-25 15:16:31 +0000 (Tue, 25 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved mayday calls in network.php when a subdirectory install isn't allowed. Also, /allow_folder_install/allow_subdirectory_install/g. fixes <a href="http://trac.wordpress.org/ticket/12884">#12884</a>, fixes <a href="http://trac.wordpress.org/ticket/12931">#12931</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 (14883 => 14884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-05-25 14:43:39 UTC (rev 14883)
+++ trunk/wp-admin/network.php 2010-05-25 15:16:31 UTC (rev 14884)
</span><span class="lines">@@ -50,14 +50,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> /**
</span><del>- * Allow folder install
</del><ins>+ * Allow subdirectory install
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @return bool Whether folder install is allowed
</del><ins>+ * @return bool Whether subdirectory install is allowed
</ins><span class="cx"> */
</span><del>-function allow_folder_install() {
</del><ins>+function allow_subdirectory_install() {
</ins><span class="cx"> global $wpdb;
</span><del>- if ( apply_filters( 'allow_folder_install', false ) )
</del><ins>+ if ( apply_filters( 'allow_subdirectory_install', false ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> $post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> $subdomain_install = (bool) $_POST['subdomain_install'];
</span><span class="cx"> } elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
</span><span class="cx"> $subdomain_install = true;
</span><del>- } elseif ( !allow_folder_install() ) {
</del><ins>+ } elseif ( !allow_subdirectory_install() ) {
</ins><span class="cx"> $subdomain_install = true;
</span><span class="cx"> } else {
</span><span class="cx"> $subdomain_install = false;
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( allow_subdomain_install() && allow_folder_install() ) : ?>
</del><ins>+ if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
</ins><span class="cx"> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
</span><span class="cx"> <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
</span><span class="lines">@@ -211,17 +211,29 @@
</span><span class="cx"> <?php if ( 'localhost' == $hostname ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</span><del>- <td><?php _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' ); ?></td>
</del><ins>+ <td><?php
+ _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
+ // Uh oh:
+ if ( !allow_subdirectory_install() )
+ echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+ ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php elseif ( !allow_subdomain_install() ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</span><del>- <td><?php _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' ); ?></td>
</del><ins>+ <td><?php
+ _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
+ // Uh oh:
+ if ( !allow_subdirectory_install() )
+ echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+ ?></td>
</ins><span class="cx"> </tr>
</span><del>- <?php elseif ( !allow_folder_install() ) : ?>
</del><ins>+ <?php elseif ( !allow_subdirectory_install() ) : ?>
</ins><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
</span><del>- <td><?php _e( 'Because your install is over 1 month old, the sites in your WordPress network must use sub-domains.' ); ?></td>
</del><ins>+ <td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
+ echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+ ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( ! $is_www ) : ?>
</span><span class="lines">@@ -266,7 +278,7 @@
</span><span class="cx"> echo '<div class="error">' . $errors->get_error_message() . '</div>';
</span><span class="cx">
</span><span class="cx"> if ( $_POST ) {
</span><del>- $subdomain_install = allow_subdomain_install() ? ( allow_folder_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
</del><ins>+ $subdomain_install = allow_subdomain_install() ? ( allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
</ins><span class="cx"> } else {
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $subdomain_install = is_subdomain_install();
</span></span></pre>
</div>
</div>
</body>
</html>