<!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>[29550] trunk/src/wp-admin: Media: Remove scan for lost attachments.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/29550">29550</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-08-20 17:08:41 +0000 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Remove scan for lost attachments.
This hasn't been worked for 4 years.
fixes <a href="http://core.trac.wordpress.org/ticket/29169">#29169</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php (29549 => 29550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2014-08-20 17:03:07 UTC (rev 29549)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2014-08-20 17:08:41 UTC (rev 29550)
</span><span class="lines">@@ -11,16 +11,16 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Constructor.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><span class="cx"> * @see WP_List_Table::__construct() for more information on default arguments.
</span><span class="cx"> *
</span><span class="cx"> * @param array $args An associative array of arguments.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> public function __construct( $args = array() ) {
</span><del>- $this->detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] );
</del><ins>+ $this->detached = isset( $_REQUEST['detached'] );
</ins><span class="cx">
</span><span class="cx"> parent::__construct( array(
</span><span class="cx"> 'plural' => 'media',
</span><span class="lines">@@ -33,15 +33,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function prepare_items() {
</span><del>- global $lost, $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
</del><ins>+ global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
</ins><span class="cx">
</span><del>- $q = $_REQUEST;
</del><ins>+ list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
</ins><span class="cx">
</span><del>- if ( !empty( $lost ) )
- $q['post__in'] = implode( ',', $lost );
-
- list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
-
</del><span class="cx"> $this->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
</span><span class="cx">
</span><span class="cx"> $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
</span><span class="lines">@@ -107,9 +102,7 @@
</span><span class="cx"> submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->detached ) {
- submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
- } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
</del><ins>+ if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
</ins><span class="cx"> submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
</span><span class="cx"> } ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -117,9 +110,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function current_action() {
</span><del>- if ( isset( $_REQUEST['find_detached'] ) )
- return 'find_detached';
-
</del><span class="cx"> if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
</span><span class="cx"> return 'attach';
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (29549 => 29550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php 2014-08-20 17:03:07 UTC (rev 29549)
+++ trunk/src/wp-admin/upload.php 2014-08-20 17:08:41 UTC (rev 29550)
</span><span class="lines">@@ -89,21 +89,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch ( $doaction ) {
</span><del>- case 'find_detached':
- if ( !current_user_can('edit_posts') )
- wp_die( __('You are not allowed to scan for lost attachments.') );
-
- $lost = $wpdb->get_col( "
- SELECT ID FROM $wpdb->posts
- WHERE post_type = 'attachment' AND post_parent > '0'
- AND post_parent NOT IN (
- SELECT ID FROM $wpdb->posts
- WHERE post_type NOT IN ( 'attachment', '" . join( "', '", get_post_types( array( 'public' => false ) ) ) . "' )
- )
- " );
-
- $_REQUEST['detached'] = 1;
- break;
</del><span class="cx"> case 'attach':
</span><span class="cx"> $parent_id = (int) $_REQUEST['found_post_id'];
</span><span class="cx"> if ( !$parent_id )
</span></span></pre>
</div>
</div>
</body>
</html>