<!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>[18617] trunk: Store Plugin/Theme uploads in the Media Library properly.</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/18617">18617</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-08-28 08:42:07 +0000 (Sun, 28 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store Plugin/Theme uploads in the Media Library properly. Add Scheduled cleanup +2hrs to clean up any aborted installation attempts. See <a href="http://core.trac.wordpress.org/ticket/18182">#18182</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (18616 => 18617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2011-08-28 05:51:38 UTC (rev 18616)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2011-08-28 08:42:07 UTC (rev 18617)
</span><span class="lines">@@ -1434,35 +1434,66 @@
</span><span class="cx"> class File_Upload_Upgrader {
</span><span class="cx"> var $package;
</span><span class="cx"> var $filename;
</span><ins>+ var $id = 0;
</ins><span class="cx">
</span><span class="cx"> function __construct($form, $urlholder) {
</span><del>- if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
- wp_die($uploads['error']);
</del><span class="cx">
</span><span class="cx"> if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
</span><span class="cx"> wp_die(__('Please select a file'));
</span><span class="cx">
</span><del>- if ( !empty($_FILES) )
</del><ins>+ //Handle a newly uploaded file, Else assume its already been uploaded
+ if ( ! empty($_FILES) ) {
+ $overrides = array( 'test_form' => false, 'test_type' => false );
+ $file = wp_handle_upload( $_FILES[$form], $overrides );
+
+ if ( isset( $file['error'] ) )
+ wp_die( $file['error'] );
+
</ins><span class="cx"> $this->filename = $_FILES[$form]['name'];
</span><del>- else if ( isset($_GET[$urlholder]) )
- $this->filename = $_GET[$urlholder];
</del><ins>+ $this->package = $file['file'];
</ins><span class="cx">
</span><del>- //Handle a newly uploaded file, Else assume its already been uploaded
- if ( !empty($_FILES) ) {
- $this->filename = wp_unique_filename( $uploads['basedir'], $this->filename );
- $this->package = $uploads['basedir'] . '/' . $this->filename;
</del><ins>+ // Construct the object array
+ $object = array(
+ 'post_title' => $this->filename,
+ 'post_content' => $file['url'],
+ 'post_mime_type' => $file['type'],
+ 'guid' => $file['url'],
+ 'context' => 'upgrader',
+ 'post_status' => 'private'
+ );
</ins><span class="cx">
</span><del>- // Move the file to the uploads dir
- if ( false === @ move_uploaded_file( $_FILES[$form]['tmp_name'], $this->package) )
- wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
</del><ins>+ // Save the data
+ $this->id = wp_insert_attachment( $object, $file['file'] );
+
+ // schedule a cleanup for 2 hours from now in case of failed install
+ wp_schedule_single_event( time() + 7200, 'upgrader_scheduled_cleanup', array( $this->id ) );
+
+ } elseif ( is_numeric( $_GET[$urlholder] ) ) {
+ // Numeric Package = previously uploaded file, see above.
+ $this->id = (int) $_GET[$urlholder];
+ $attachment = get_post( $this->id );
+ if ( empty($attachment) )
+ wp_die(__('Please select a file'));
+
+ $this->filename = $attachment->post_title;
+ $this->package = get_attached_file( $attachment->ID );
</ins><span class="cx"> } else {
</span><ins>+ // Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
+ if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
+ wp_die( $uploads['error'] );
+
+ $this->filename = $_GET[$urlholder];
</ins><span class="cx"> $this->package = $uploads['basedir'] . '/' . $this->filename;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function cleanup() {
</span><del>- if ( file_exists($this->package) )
- return @unlink($this->package);
</del><ins>+ if ( $this->id )
+ wp_delete_attachment( $this->id );
+
+ elseif ( file_exists( $this->package ) )
+ return @unlink( $this->package );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (18616 => 18617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2011-08-28 05:51:38 UTC (rev 18616)
+++ trunk/wp-admin/update.php 2011-08-28 08:42:07 UTC (rev 18617)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
</span><span class="cx"> $nonce = 'plugin-upload';
</span><del>- $url = add_query_arg(array('package' => $file_upload->filename ), 'update.php?action=upload-plugin');
</del><ins>+ $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
</ins><span class="cx"> $type = 'upload'; //Install plugin type, From Web or an Upload.
</span><span class="cx">
</span><span class="cx"> $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
</span><span class="cx"> $nonce = 'theme-upload';
</span><del>- $url = add_query_arg(array('package' => $file_upload->filename), 'update.php?action=upload-theme');
</del><ins>+ $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
</ins><span class="cx"> $type = 'upload'; //Install plugin type, From Web or an Upload.
</span><span class="cx">
</span><span class="cx"> $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
</span></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (18616 => 18617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2011-08-28 05:51:38 UTC (rev 18616)
+++ trunk/wp-includes/default-filters.php 2011-08-28 08:42:07 UTC (rev 18617)
</span><span class="lines">@@ -259,6 +259,7 @@
</span><span class="cx"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
</span><span class="cx"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</span><span class="cx"> add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
</span><ins>+add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
</ins><span class="cx">
</span><span class="cx"> // Navigation menu actions
</span><span class="cx"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span></span></pre>
</div>
</div>
</body>
</html>