<!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" />
<title>[21822] trunk/wp-includes: Always return upload directory information from wp_upload_dir(), even if there is an error.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21822">21822</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-11 22:06:49 +0000 (Tue, 11 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always return upload directory information from wp_upload_dir(), even if there is an error. Append the error to the array. see <a href="http://core.trac.wordpress.org/ticket/19235">#19235</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.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 (21821 => 21822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-09-11 21:21:32 UTC (rev 21821)
+++ trunk/wp-includes/functions.php 2012-09-11 22:06:49 UTC (rev 21822)
</span><span class="lines">@@ -1467,8 +1467,8 @@
</span><span class="cx"> $url = str_replace( UPLOADS, 'files', $url );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $bdir = $dir;
- $burl = $url;
</del><ins>+ $basedir = $dir;
+ $baseurl = $url;
</ins><span class="cx">
</span><span class="cx"> $subdir = '';
</span><span class="cx"> if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
</span><span class="lines">@@ -1483,12 +1483,20 @@
</span><span class="cx"> $dir .= $subdir;
</span><span class="cx"> $url .= $subdir;
</span><span class="cx">
</span><del>- $uploads = apply_filters( 'upload_dir', array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ) );
</del><ins>+ $uploads = apply_filters( 'upload_dir',
+ array(
+ 'path' => $dir,
+ 'url' => $url,
+ 'subdir' => $subdir,
+ 'basedir' => $basedir,
+ 'baseurl' => $baseurl,
+ 'error' => false,
+ ) );
</ins><span class="cx">
</span><span class="cx"> // Make sure we have an uploads dir
</span><span class="cx"> if ( ! wp_mkdir_p( $uploads['path'] ) ) {
</span><span class="cx"> $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $uploads['path'] );
</span><del>- return array( 'error' => $message );
</del><ins>+ $uploads['error'] = $message;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $uploads;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (21821 => 21822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2012-09-11 21:21:32 UTC (rev 21821)
+++ trunk/wp-includes/post.php 2012-09-11 22:06:49 UTC (rev 21822)
</span><span class="lines">@@ -223,11 +223,10 @@
</span><span class="cx"> function _wp_relative_upload_path( $path ) {
</span><span class="cx"> $new_path = $path;
</span><span class="cx">
</span><del>- if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) {
- if ( 0 === strpos($new_path, $uploads['basedir']) ) {
- $new_path = str_replace($uploads['basedir'], '', $new_path);
- $new_path = ltrim($new_path, '/');
- }
</del><ins>+ $uploads = wp_upload_dir();
+ if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
+ $new_path = str_replace( $uploads['basedir'], '', $new_path );
+ $new_path = ltrim( $new_path, '/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( '_wp_relative_upload_path', $new_path, $path );
</span></span></pre>
</div>
</div>
</body>
</html>