<!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>[12924] trunk: internalize uploaded media rewrite rule, see #11742</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12924">12924</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-02 02:17:33 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>internalize uploaded media rewrite rule, see <a href="http://trac.wordpress.org/ticket/11742">#11742</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/blogs.php (12923 => 12924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php 2010-02-01 23:12:26 UTC (rev 12923)
+++ trunk/wp-content/blogs.php 2010-02-02 02:17:33 UTC (rev 12924)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> <?php
</span><del>-define( 'SHORTINIT', true ); // this prevents most of WP from being loaded
-require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); // absolute includes are faster
</del><ins>+if ( !defined( 'MEDIA_FILE' ) ) {
+ define( 'SHORTINIT', true ); // this prevents most of WP from being loaded
+ require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); // absolute includes are faster
+}
</ins><span class="cx">
</span><span class="cx"> if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
</span><span class="cx"> status_header( 404 );
</span><span class="lines">@@ -64,8 +66,10 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-
-$file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] );
</del><ins>+if ( defined( 'MEDIA_FILE' ) )
+ $file = BLOGUPLOADDIR . str_replace( '..', '', MEDIA_FILE );
+else
+ $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="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12923 => 12924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-01 23:12:26 UTC (rev 12923)
+++ trunk/wp-settings.php 2010-02-02 02:17:33 UTC (rev 12924)
</span><span class="lines">@@ -82,6 +82,17 @@
</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><ins>+// 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 );
+}
</ins><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 class="lines">@@ -272,4 +283,4 @@
</span><span class="cx"> // Everything is loaded and initialized.
</span><span class="cx"> do_action( 'init' );
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>