<!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>[13632] trunk/wp-includes/ms-default-constants.php:
Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13632">13632</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-09 18:19:28 +0000 (Tue, 09 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dont define BLOGUPLOADDIR if UPLOADS is defined, see <a href="http://trac.wordpress.org/ticket/12558">#12558</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsdefaultconstantsphp">trunk/wp-includes/ms-default-constants.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-constants.php (13631 => 13632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-constants.php 2010-03-09 18:08:25 UTC (rev 13631)
+++ trunk/wp-includes/ms-default-constants.php 2010-03-09 18:19:28 UTC (rev 13632)
</span><span class="lines">@@ -15,16 +15,17 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> /** @since 3.0.0 */
</span><ins>+ // Base uploads dir relative to ABSPATH
</ins><span class="cx"> if ( !defined( 'UPLOADBLOGSDIR' ) )
</span><span class="cx"> define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
</span><span class="cx">
</span><span class="cx"> /** @since 3.0.0 */
</span><del>- if ( !defined( 'UPLOADS' ) )
</del><ins>+ if ( !defined( 'UPLOADS' ) ) {
+ // Uploads dir relative to ABSPATH
</ins><span class="cx"> define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
</span><del>-
- /** @since 3.0.0 */
- if ( !defined( 'BLOGUPLOADDIR' ) )
- define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
</del><ins>+ if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR )
+ define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>