<!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>[13675] trunk/wp-admin/network.php: Improve multisite rewrite rules.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13675">13675</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-11 22:33:52 +0000 (Thu, 11 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve multisite rewrite rules. Construct rules dynamically and skip subdirectory-specific rules for subdomain installs. see <a href="http://trac.wordpress.org/ticket/12136">#12136</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 (13674 => 13675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-11 21:58:17 UTC (rev 13674)
+++ trunk/wp-admin/network.php 2010-03-11 22:33:52 UTC (rev 13675)
</span><span class="lines">@@ -21,9 +21,10 @@
</span><span class="cx"> $wpdb->$table = $prefixed_table;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Check for existing network data/tables.
</del><ins>+ * Check for an existing network.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><ins>+ * @return Whether a network exists.
</ins><span class="cx"> */
</span><span class="cx"> function network_domain_check() {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -36,15 +37,14 @@
</span><span class="cx"> * Get base domain of network.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><ins>+ * @return string Base domain.
</ins><span class="cx"> */
</span><span class="cx"> function get_clean_basedomain() {
</span><del>- global $wpdb;
- $existing_domain = network_domain_check();
- if ( $existing_domain )
</del><ins>+ if ( $existing_domain = network_domain_check() )
</ins><span class="cx"> return $existing_domain;
</span><span class="cx"> $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
</span><del>- if ( strpos( $domain, '/' ) )
- $domain = substr( $domain, 0, strpos( $domain, '/' ) );
</del><ins>+ if ( $slash = strpos( $domain, '/' ) )
+ $domain = substr( $domain, 0, $slash );
</ins><span class="cx"> return $domain;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -280,29 +280,30 @@
</span><span class="cx"> ?>
</span><span class="cx"> </li>
</span><span class="cx"> <?php
</span><del>-
-// @todo custom content dir
</del><ins>+// Construct an htaccess file.
</ins><span class="cx"> $htaccess_file = 'RewriteEngine On
</span><span class="cx"> RewriteBase ' . $base . '
</span><span class="cx">
</span><span class="cx"> # uploaded files
</span><del>-RewriteRule ^(.*/)?files/$ index.php [L]
-RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
-RewriteRule ^(.*/)?files/(.*) wp-includes/ms-files.php?file=$2 [L]
</del><ins>+RewriteRule ^' . ( $vhost ? '([_0-9a-zA-Z-]+/)?' : '' ) . 'files/(.+) wp-includes/ms-files.php?file=$2 [L]' . "\n";
</ins><span class="cx">
</span><del>-# add a trailing slash to /wp-admin
-RewriteCond %{REQUEST_URI} ^.*/wp-admin$
-RewriteRule ^(.+)$ $1/ [R=301,L]
</del><ins>+if ( ! $vhost )
+ $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n";
</ins><span class="cx">
</span><del>-RewriteCond %{REQUEST_FILENAME} -f [OR]
</del><ins>+$htaccess_file .= "\n" . 'RewriteCond %{REQUEST_FILENAME} -f [OR]
</ins><span class="cx"> RewriteCond %{REQUEST_FILENAME} -d
</span><del>-RewriteRule . - [L]
-RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
-RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
-RewriteRule . index.php [L]';
</del><ins>+RewriteRule ^ - [L]';
+
+// @todo custom content dir.
+if ( ! $vhost )
+ $htaccess_file .= "\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]';
+
+$htaccess_file .= "\nRewriteRule . index.php [L]";
+
</ins><span class="cx"> ?>
</span><span class="cx"> <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
</span><del>- <textarea class="code" readonly="readonly" cols="100" rows="18">
</del><ins>+ <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $vhost ? 10 : 15; ?>">
</ins><span class="cx"> <?php echo wp_htmledit_pre( $htaccess_file ); ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span></span></pre>
</div>
</div>
</body>
</html>