<!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" />
<title>[22222] trunk/wp-includes: Have wp_upload_dir() account for blog switching, ms-files rewriting, and the UPLOADS constant properly.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22222">22222</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-12 22:05:02 +0000 (Fri, 12 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have wp_upload_dir() account for blog switching, ms-files rewriting, and the UPLOADS constant properly. This type of logic needs a lot of code comments.
Prevents wp_upload_dir() from obeying the UPLOADS constant when ms-files rewriting is enabled and a blog is switched.
Reverts <a href="http://core.trac.wordpress.org/changeset/22106">[22106]</a> thanks to <a href="http://core.trac.wordpress.org/changeset/22108">[22108]</a>.
see <a href="http://core.trac.wordpress.org/ticket/19235">#19235</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesmsdefaultconstantsphp">trunk/wp-includes/ms-default-constants.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (22221 => 22222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-10-12 18:41:38 UTC (rev 22221)
+++ trunk/wp-includes/functions.php 2012-10-12 22:05:02 UTC (rev 22222)
</span><span class="lines">@@ -1503,26 +1503,39 @@
</span><span class="cx"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined( 'UPLOADS' ) ) {
</del><ins>+ // Obey the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
+ // We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
+ if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
</ins><span class="cx"> $dir = ABSPATH . UPLOADS;
</span><span class="cx"> $url = trailingslashit( $siteurl ) . UPLOADS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If multisite (if not the main site in a post-MU network)
- $blog_id = get_current_blog_id();
- if ( is_multisite() && ! ( is_main_site( $blog_id ) && defined( 'MULTISITE' ) ) ) {
</del><ins>+ // If multisite (and if not the main site in a post-MU network)
+ if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) ) {
</ins><span class="cx">
</span><span class="cx"> if ( ! get_site_option( 'ms_files_rewriting' ) ) {
</span><del>- // Append sites/%d if we're not on the main site (for post-MU networks). The extra directory
</del><ins>+ // If ms-files rewriting is disabled (networks created post-3.5), it is fairly straightforward:
+ // Append sites/%d if we're not on the main site (for post-MU networks). (The extra directory
</ins><span class="cx"> // prevents a four-digit ID from conflicting with a year-based directory for the main site.
</span><span class="cx"> // But if a MU-era network has disabled ms-files rewriting manually, they don't need the extra
</span><del>- // directory, as they never had wp-content/uploads for the main site.
</del><ins>+ // directory, as they never had wp-content/uploads for the main site.)
</ins><span class="cx">
</span><del>- $ms_dir = defined( 'MULTISITE' ) ? '/sites/' : '/';
- $dir .= $ms_dir . $blog_id;
- $url .= $ms_dir . $blog_id;
- } elseif ( ! ms_is_switched() ) {
</del><ins>+ if ( defined( 'MULTISITE' ) )
+ $ms_dir = '/sites/' . get_current_blog_id();
+ else
+ $ms_dir = '/' . get_current_blog_id();
+
+ $dir .= $ms_dir;
+ $url .= $ms_dir;
+
+ } elseif ( defined( 'UPLOADS' ) && ! ms_is_switched() ) {
</ins><span class="cx"> // Handle the old-form ms-files.php rewriting if the network still has that enabled.
</span><ins>+ // When ms-files rewriting is enabled, then we only listen to UPLOADS when:
+ // 1) we are not on the main site in a post-MU network,
+ // as wp-content/uploads is used there, and
+ // 2) we are not switched, as ms_upload_constants() hardcodes
+ // these constants to reflect the original blog ID.
+
</ins><span class="cx"> if ( defined( 'BLOGUPLOADDIR' ) )
</span><span class="cx"> $dir = untrailingslashit( BLOGUPLOADDIR );
</span><span class="cx"> $url = str_replace( UPLOADS, 'files', $url );
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-constants.php (22221 => 22222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-constants.php 2012-10-12 18:41:38 UTC (rev 22221)
+++ trunk/wp-includes/ms-default-constants.php 2012-10-12 22:05:02 UTC (rev 22222)
</span><span class="lines">@@ -28,11 +28,10 @@
</span><span class="cx"> if ( !defined( 'UPLOADBLOGSDIR' ) )
</span><span class="cx"> define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
</span><span class="cx">
</span><del>- // The main site in a post-MU network uses wp-content/uploads.
- // This used to be handled in wp_upload_dir() by ignoring UPLOADS for this case. Avoid defining it instead.
</del><ins>+ // Note, the main site in a post-MU network uses wp-content/uploads.
+ // This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
</ins><span class="cx"> if ( ! defined( 'UPLOADS' ) ) {
</span><del>- if ( ! ( is_main_site() && defined( 'MULTISITE' ) ) )
- define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
</del><ins>+ define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
</ins><span class="cx">
</span><span class="cx"> // Uploads dir relative to ABSPATH
</span><span class="cx"> if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
</span></span></pre>
</div>
</div>
</body>
</html>