Wordpress 3.0.6

[autoinstalls/wordpress.git] / wp-admin / edit-attachment-rows.php

diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 3842a6cce2c778b58220515027e0336545e342c6..d88316be90978a1888849881f5123e76bd026634 100644 (file)
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -30,12 +30,18 @@ add_filter('the_title','esc_html');
 $alt = '';
 $posts_columns = get_column_headers('upload');
 $hidden = get_hidden_columns('upload');
-while (have_posts()) : the_post();
+
+while ( have_posts() ) : the_post();
+
+if ( $is_trash && $post->post_status != 'trash' )
+       continue;
+elseif ( !$is_trash && $post->post_status == 'trash' )
+       continue;
+
 $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
-global $current_user;
-$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
-$att_title = _draft_or_post_title();
 
+$post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+$att_title = _draft_or_post_title();
 ?>
        <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
 
@@ -53,7 +59,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 
        case 'cb':
                ?>
-               <th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></th>
+               <th scope="row" class="check-column"><?php if ( current_user_can('edit_post', $post->ID) ) { ?><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /><?php } ?></th>
                <?php
                break;
 
@@ -62,13 +68,15 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
                ?>
                <td <?php echo $attributes ?>><?php
                        if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) {
+                               if ( $is_trash ) echo $thumb;
+                               else {
 ?>
-
-                               <a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>">
+                               <a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>">
                                        <?php echo $thumb; ?>
                                </a>
 
 <?php                  }
+                       }
                ?></td>
                <?php
                // TODO
@@ -76,16 +84,34 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 
        case 'media':
                ?>
-               <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
-               <?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+               <td <?php echo $attributes ?>><strong><?php if ( $is_trash ) echo $att_title; else { ?><a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a><?php } ?></strong>
                <p>
                <?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() ) );
+               ?>
+               </p>
+               <?php
                $actions = array();
-               if ( current_user_can('edit_post', $post->ID) )
+               if ( current_user_can('edit_post', $post->ID) && !$is_trash )
                        $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
-               if ( current_user_can('delete_post', $post->ID) )
-                       $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-               $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+               if ( current_user_can('delete_post', $post->ID) ) {
+                       if ( $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 ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+                               $delete_ays = (!$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 ( !$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 );
                $action_count = count($actions);
                $i = 0;
                echo '<div class="row-actions">';
@@ -95,7 +121,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
                        echo "<span class='$action'>$link$sep</span>";
                }
                echo '</div>';
-               ?></p></td>
+               ?></td>
                <?php
                break;
 
@@ -158,7 +184,8 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
                        <?php
                } else {
                        ?>
-                       <td <?php echo $attributes ?>>&nbsp;</td>
+                       <td <?php echo $attributes ?>><?php _e('(Unattached)'); ?><br />
+                       <a class="hide-if-no-js" onclick="findPosts.open('media[]','<?php echo $post->ID ?>');return false;" href="#the-list"><?php _e('Attach'); ?></a></td>
                        <?php
                }