<!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>[15197] trunk/wp-includes/functions.php: allow custom content dir in WP 3.
0 main site, fixes #13733</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15197">15197</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-06-10 19:37:51 +0000 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>allow custom content dir in WP 3.0 main site, fixes <a href="http://trac.wordpress.org/ticket/13733">#13733</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.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 (15196 => 15197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-06-10 18:28:25 UTC (rev 15196)
+++ trunk/wp-includes/functions.php 2010-06-10 19:37:51 UTC (rev 15197)
</span><span class="lines">@@ -2125,14 +2125,13 @@
</span><span class="cx"> $siteurl = get_option( 'siteurl' );
</span><span class="cx"> $upload_path = get_option( 'upload_path' );
</span><span class="cx"> $upload_path = trim($upload_path);
</span><del>- $main_override = false;
</del><ins>+ $main_override = defined( 'MULTISITE' ) && is_main_site();
</ins><span class="cx"> if ( empty($upload_path) ) {
</span><span class="cx"> $dir = WP_CONTENT_DIR . '/uploads';
</span><span class="cx"> } else {
</span><span class="cx"> $dir = $upload_path;
</span><span class="cx"> if ( 'wp-content/uploads' == $upload_path ) {
</span><span class="cx"> $dir = WP_CONTENT_DIR . '/uploads';
</span><del>- $main_override = defined( 'MULTISITE' ) && is_main_site();
</del><span class="cx"> } elseif ( 0 !== strpos($dir, ABSPATH) ) {
</span><span class="cx"> // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
</span><span class="cx"> $dir = path_join( ABSPATH, $dir );
</span><span class="lines">@@ -2146,12 +2145,12 @@
</span><span class="cx"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined('UPLOADS') && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
</del><ins>+ if ( defined('UPLOADS') && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
</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 ( is_multisite() && ( !$main_override || WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !isset( $switched ) || $switched === false ) ) {
</del><ins>+ if ( is_multisite() && !$main_override && ( !isset( $switched ) || $switched === false ) ) {
</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>
</div>
</body>
</html>