<!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>[14510] trunk/wp-includes/functions.php:
add upload dir support to switch to blog, props ocean90, see #11998</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14510">14510</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-07 22:50:05 +0000 (Fri, 07 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add upload dir support to switch to blog, props ocean90, see <a href="http://trac.wordpress.org/ticket/11998">#11998</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 (14509 => 14510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-05-07 21:53:11 UTC (rev 14509)
+++ trunk/wp-includes/functions.php 2010-05-07 22:50:05 UTC (rev 14510)
</span><span class="lines">@@ -2114,6 +2114,7 @@
</span><span class="cx"> * @return array See above for description.
</span><span class="cx"> */
</span><span class="cx"> function wp_upload_dir( $time = null ) {
</span><ins>+ global $switched;
</ins><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><span class="lines">@@ -2136,12 +2137,12 @@
</span><span class="cx"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
</del><ins>+ if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !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() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
</del><ins>+ if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) && ( !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>