<!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>[13619] trunk:
allow existing media path on main site when converting to multisite,
see #12549</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13619">13619</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-08 19:52:29 +0000 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>allow existing media path on main site when converting to multisite, see <a href="http://trac.wordpress.org/ticket/12549">#12549</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13618 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-03-08 16:31:12 UTC (rev 13618)
+++ trunk/wp-admin/includes/schema.php 2010-03-08 19:52:29 UTC (rev 13619)
</span><span class="lines">@@ -726,6 +726,10 @@
</span><span class="cx"> $blog_id = $wpdb->insert_id;
</span><span class="cx"> update_user_meta( $site_user->ID, 'source_domain', $domain );
</span><span class="cx"> update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
</span><ins>+ if ( !$upload_path = get_option( 'upload_path' ) ) {
+ $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads';
+ update_option( 'upload_path', $upload_path );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $vhost == 'yes' )
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13618 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-03-08 16:31:12 UTC (rev 13618)
+++ trunk/wp-includes/functions.php 2010-03-08 19:52:29 UTC (rev 13619)
</span><span class="lines">@@ -2131,7 +2131,7 @@
</span><span class="cx"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined('UPLOADS') ) {
</del><ins>+ if ( defined('UPLOADS') && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
</ins><span class="cx"> $dir = ABSPATH . UPLOADS;
</span><span class="cx"> $url = trailingslashit( $siteurl ) . UPLOADS;
</span><span class="cx"> }
</span><span class="lines">@@ -4077,4 +4077,4 @@
</span><span class="cx"> function __return_false() {
</span><span class="cx"> return false;
</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>