<!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>[16229] trunk/wp-admin/includes/class-wp-media-list-table.php:
WP_Media_List_Table: merge display_rows() and display_orphans().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16229">16229</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-06 23:00:17 +0000 (Sat, 06 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_Media_List_Table: merge display_rows() and display_orphans(). See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (16228 => 16229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php 2010-11-06 22:51:43 UTC (rev 16228)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php 2010-11-06 23:00:17 UTC (rev 16229)
</span><span class="lines">@@ -168,11 +168,6 @@
</span><span class="cx"> function display_rows() {
</span><span class="cx"> global $post, $id;
</span><span class="cx">
</span><del>- if ( $this->detached ) {
- $this->display_orphans();
- return;
- }
-
</del><span class="cx"> add_filter( 'the_title','esc_html' );
</span><span class="cx"> $alt = '';
</span><span class="cx">
</span><span class="lines">@@ -239,25 +234,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><del>- $actions = array();
- if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
- $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
- if ( current_user_can( 'delete_post', $post->ID ) ) {
- if ( $this->is_trash )
- $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-attachment_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
- elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
- $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
- if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
- $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
- $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
- }
- }
- if ( !$this->is_trash ) {
- $title =_draft_or_post_title( $post->post_parent );
- $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
- }
- $actions = apply_filters( 'media_row_actions', $actions, $post );
- echo $this->row_actions( $actions );
</del><ins>+ echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
</ins><span class="cx"> ?>
</span><span class="cx"> </td>
</span><span class="cx"> <?php
</span><span class="lines">@@ -361,41 +338,10 @@
</span><span class="cx"> <?php endwhile;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function display_orphans() {
- global $post;
</del><ins>+ function _get_row_actions( $post, $att_title ) {
+ $actions = array();
</ins><span class="cx">
</span><del>- $class = '';
-
- while ( have_posts() ) : the_post();
-
- $class = ( 'alternate' == $class ) ? '' : 'alternate';
- $att_title = esc_html( _draft_or_post_title( $post->ID ) );
-
- $edit_link = '<a href="' . get_edit_post_link( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ) . '">%s</a>';
-?>
- <tr id='post-<?php echo $post->ID; ?>' class='<?php echo $class; ?>' valign="top">
- <th scope="row" class="check-column">
- <?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?>
- <input type="checkbox" name="media[]" value="<?php echo esc_attr( $post->ID ); ?>" />
- <?php } ?>
- </th>
-
- <td class="media-icon">
- <?php if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
- printf( $edit_link, $thumb );
- } ?>
- </td>
-
- <td class="media column-media">
- <strong><?php printf( $edit_link, $att_title ); ?></strong><br />
-<?php
- if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
- echo esc_html( strtoupper( $matches[1] ) );
- else
- echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
-?>
-<?php
- $actions = array();
</del><ins>+ if ( $this->detached ) {
</ins><span class="cx"> if ( current_user_can( 'edit_post', $post->ID ) )
</span><span class="cx"> $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
</span><span class="cx"> if ( current_user_can( 'delete_post', $post->ID ) )
</span><span class="lines">@@ -408,35 +354,29 @@
</span><span class="cx"> $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
</span><span class="cx"> if ( current_user_can( 'edit_post', $post->ID ) )
</span><span class="cx"> $actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
</span><del>- $actions = apply_filters( 'media_row_actions', $actions, $post );
-
- echo $this->row_actions( $actions );
-?>
- </td>
- <td class="author column-author">
- <?php $author = get_userdata( $post->post_author ); echo $author->display_name; ?>
- </td>
-<?php
- if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
- $t_time = $h_time = __( 'Unpublished' );
- } else {
- $t_time = get_the_time( __( 'Y/m/d g:i:s A' ) );
- $m_time = $post->post_date;
- $time = get_post_time( 'G', true );
- if ( ( abs( $t_diff = time() - $time ) ) < 86400 ) {
- if ( $t_diff < 0 )
- $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
- else
- $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
- } else {
- $h_time = mysql2date( __( 'Y/m/d' ), $m_time );
</del><ins>+ }
+ else {
+ if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
+ $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
+ if ( current_user_can( 'delete_post', $post->ID ) ) {
+ if ( $this->is_trash )
+ $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-attachment_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+ elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
+ $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+ if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+ $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+ $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+ }
</ins><span class="cx"> }
</span><ins>+ if ( !$this->is_trash ) {
+ $title =_draft_or_post_title( $post->post_parent );
+ $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+ }
</ins><span class="cx"> }
</span><del>-?>
- <td class="date column-date"><?php echo $h_time ?></td>
- </tr>
-<?php
- endwhile;
</del><ins>+
+ $actions = apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+
+ return $actions;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>