<!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>[22105] trunk/wp-admin/includes: Pass the post date to wp_upload_dir() during sideloads, just as we do uploads.</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/22105">22105</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-03 18:49:37 +0000 (Wed, 03 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass the post date to wp_upload_dir() during sideloads, just as we do uploads. Ensures that sideloaded images make it into the right uploads directory.
props solarisssmoke, fixes <a href="http://core.trac.wordpress.org/ticket/16777">#16777</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (22104 => 22105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2012-10-03 16:31:03 UTC (rev 22104)
+++ trunk/wp-admin/includes/file.php 2012-10-03 18:49:37 UTC (rev 22105)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Functions for reading, writing, modifying, and deleting files on the file system.
</span><del>- * Includes functionality for theme-specific files as well as operations for uploading,
</del><ins>+ * Includes functionality for theme-specific files as well as operations for uploading,
</ins><span class="cx"> * archiving, and rendering output when necessary.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> * @uses delete_transient
</span><span class="cx"> * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
</span><span class="cx"> * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
</span><ins>+ * @param string $time Optional. Time formatted in 'yyyy/mm'.
</ins><span class="cx"> * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
</span><span class="cx"> */
</span><span class="cx"> function wp_handle_upload( &$file, $overrides = false, $time = null ) {
</span><span class="lines">@@ -359,9 +360,10 @@
</span><span class="cx"> * @uses wp_unique_filename
</span><span class="cx"> * @param array $file an array similar to that of a PHP $_FILES POST array
</span><span class="cx"> * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
</span><ins>+ * @param string $time Optional. Time formatted in 'yyyy/mm'.
</ins><span class="cx"> * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
</span><span class="cx"> */
</span><del>-function wp_handle_sideload( &$file, $overrides = false ) {
</del><ins>+function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
</ins><span class="cx"> // The default error handler.
</span><span class="cx"> if (! function_exists( 'wp_handle_upload_error' ) ) {
</span><span class="cx"> function wp_handle_upload_error( &$file, $message ) {
</span><span class="lines">@@ -438,7 +440,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // A writable uploads dir will pass this test. Again, there's no point overriding this one.
</span><del>- if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
</del><ins>+ if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) )
</ins><span class="cx"> return $upload_error_handler( $file, $uploads['error'] );
</span><span class="cx">
</span><span class="cx"> $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22104 => 22105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2012-10-03 16:31:03 UTC (rev 22104)
+++ trunk/wp-admin/includes/media.php 2012-10-03 18:49:37 UTC (rev 22105)
</span><span class="lines">@@ -269,7 +269,13 @@
</span><span class="cx"> function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
</span><span class="cx"> $overrides = array('test_form'=>false);
</span><span class="cx">
</span><del>- $file = wp_handle_sideload($file_array, $overrides);
</del><ins>+ $time = current_time( 'mysql' );
+ if ( $post = get_post( $post_id ) ) {
+ if ( substr( $post->post_date, 0, 4 ) > 0 )
+ $time = $post->post_date;
+ }
+
+ $file = wp_handle_sideload( $file_array, $overrides, $time );
</ins><span class="cx"> if ( isset($file['error']) )
</span><span class="cx"> return new WP_Error( 'upload_error', $file['error'] );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>