<!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>[12926] trunk: pass #2 change uploaded media rewrite rule, props nacin,
see #11742</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12926">12926</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-02 16:32:19 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>pass <a href="http://trac.wordpress.org/ticket/2">#2</a> change uploaded media rewrite rule, props nacin, see <a href="http://trac.wordpress.org/ticket/11742">#11742</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeshtaccessms">trunk/wp-admin/includes/htaccess.ms</a></li>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesblogsphp">trunk/wp-includes/blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeshtaccessms"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/htaccess.ms (12925 => 12926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/htaccess.ms 2010-02-02 03:18:27 UTC (rev 12925)
+++ trunk/wp-admin/includes/htaccess.ms 2010-02-02 16:32:19 UTC (rev 12926)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> #uploaded files
</span><span class="cx"> RewriteRule ^(.*/)?files/$ index.php [L]
</span><span class="cx"> RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
</span><del>-RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]
</del><ins>+RewriteRule ^(.*/)?files/(.*) wp-includes/blogs.php?file=$2 [L]
</ins><span class="cx">
</span><span class="cx"> # add a trailing slash to /wp-admin
</span><span class="cx"> RewriteCond %{REQUEST_URI} ^.*/wp-admin$
</span></span></pre></div>
<a id="trunkwpcontentblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/blogs.php (12925 => 12926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php 2010-02-02 03:18:27 UTC (rev 12925)
+++ trunk/wp-content/blogs.php 2010-02-02 16:32:19 UTC (rev 12926)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?php
</span><del>-if ( !defined( 'MEDIA_FILE' ) ) {
</del><ins>+if ( !defined( 'SHORTINIT' ) ) {
</ins><span class="cx"> define( 'SHORTINIT', true ); // this prevents most of WP from being loaded
</span><span class="cx"> require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); // absolute includes are faster
</span><span class="cx"> }
</span><span class="lines">@@ -66,10 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-if ( defined( 'MEDIA_FILE' ) )
- $file = BLOGUPLOADDIR . str_replace( '..', '', MEDIA_FILE );
-else
- $file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] );
</del><ins>+$file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] );
</ins><span class="cx"> if ( !is_file( $file ) ) {
</span><span class="cx"> status_header( 404 );
</span><span class="cx"> die('404 &#8212; File not found.');
</span></span></pre></div>
<a id="trunkwpincludesblogsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/blogs.php (0 => 12926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/blogs.php (rev 0)
+++ trunk/wp-includes/blogs.php 2010-02-02 16:32:19 UTC (rev 12926)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?php
+/**
+ * Load mulitsite uploaded media
+ *
+ * @since 3.0.0
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ */
+
+define( 'SHORTINIT', true );
+require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); // absolute includes are faster
+require_once( WP_CONTENT_DIR . '/blogs.php' );
+exit();
</ins></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12925 => 12926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-02 03:18:27 UTC (rev 12925)
+++ trunk/wp-settings.php 2010-02-02 16:32:19 UTC (rev 12926)
</span><span class="lines">@@ -82,17 +82,6 @@
</span><span class="cx"> require( ABSPATH . WPINC . '/default-filters.php' );
</span><span class="cx"> include_once( ABSPATH . WPINC . '/pomo/mo.php' );
</span><span class="cx">
</span><del>-// internalize virtual content rewrite rule
-if ( is_multisite() && !defined( 'SHORTINIT' ) ) {
- $media_base = $path . 'files/';
- $base_len = strlen( $media_base );
- if ( substr( $_SERVER[ 'REQUEST_URI' ], 0, $media_len ) == $media_base && $media_len < strlen( $_SERVER[ 'REQUEST_URI' ] ) ) {
- define( 'MEDIA_FILE', substr( $_SERVER[ 'REQUEST_URI' ], $media_len ) );
- require_once( WP_CONTENT_DIR . '/blogs.php' );
- exit();
- }
- unset( $media_base, $media_len );
-}
</del><span class="cx"> // Stop most of WordPress from being loaded if we just want the basics.
</span><span class="cx"> if ( SHORTINIT )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>