<!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>[12405] trunk: Fix upload dir defaults.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12405">12405</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-15 17:53:51 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix upload dir defaults. Props Denis-de-Bernardy. fixes <a href="http://trac.wordpress.org/ticket/11276">#11276</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminoptionsmiscphp">trunk/wp-admin/options-misc.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 (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2009-12-15 16:04:32 UTC (rev 12404)
+++ trunk/wp-admin/includes/schema.php 2009-12-15 17:53:51 UTC (rev 12405)
</span><span class="lines">@@ -189,12 +189,10 @@
</span><span class="cx"> do_action('populate_options');
</span><span class="cx">
</span><span class="cx"> if ( ini_get('safe_mode') ) {
</span><del>- // Safe mode screws up mkdir(), so we must use a flat structure.
</del><ins>+ // Safe mode can break mkdir() so use a flat structure by default.
</ins><span class="cx"> $uploads_use_yearmonth_folders = 0;
</span><del>- $upload_path = WP_CONTENT_DIR;
</del><span class="cx"> } else {
</span><span class="cx"> $uploads_use_yearmonth_folders = 1;
</span><del>- $upload_path = WP_CONTENT_DIR . '/uploads';
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="lines">@@ -265,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> // 2.0.1
</span><span class="cx"> 'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
</span><del>- 'upload_path' => $upload_path,
</del><ins>+ 'upload_path' => '',
</ins><span class="cx">
</span><span class="cx"> // 2.0.3
</span><span class="cx"> 'secret' => wp_generate_password(64),
</span></span></pre></div>
<a id="trunkwpadminoptionsmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-misc.php (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-misc.php 2009-12-15 16:04:32 UTC (rev 12404)
+++ trunk/wp-admin/options-misc.php 2009-12-15 17:53:51 UTC (rev 12405)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
</span><del>-<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" class="regular-text code" />
</del><ins>+<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
</ins><span class="cx"> <span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12404 => 12405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-12-15 16:04:32 UTC (rev 12404)
+++ trunk/wp-includes/functions.php 2009-12-15 17:53:51 UTC (rev 12405)
</span><span class="lines">@@ -2035,16 +2035,20 @@
</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>- if ( empty($upload_path) )
</del><ins>+ if ( empty($upload_path) ) {
</ins><span class="cx"> $dir = WP_CONTENT_DIR . '/uploads';
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $dir = $upload_path;
</span><ins>+ if ( 'wp-content/uploads' == $upload_path ) {
+ $dir = WP_CONTENT_DIR . '/uploads';
+ } elseif ( 0 !== strpos($dir, ABSPATH) ) {
+ // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
+ $dir = path_join( ABSPATH, $dir );
+ }
+ }
</ins><span class="cx">
</span><del>- // $dir is absolute, $path is (maybe) relative to ABSPATH
- $dir = path_join( ABSPATH, $dir );
-
</del><span class="cx"> if ( !$url = get_option( 'upload_url_path' ) ) {
</span><del>- if ( empty($upload_path) or ( $upload_path == $dir ) )
</del><ins>+ if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
</ins><span class="cx"> $url = WP_CONTENT_URL . '/uploads';
</span><span class="cx"> else
</span><span class="cx"> $url = trailingslashit( $siteurl ) . $upload_path;
</span></span></pre>
</div>
</div>
</body>
</html>