Index: wp-admin/includes/class-wp-ms-users-list-table.php =================================================================== --- wp-admin/includes/class-wp-ms-users-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-ms-users-list-table.php (working copy) @@ -140,6 +140,10 @@ ); } + function get_primary_column() { + return( 'username' ); + } + function display_rows() { global $mode; @@ -159,10 +163,14 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) : - $class = "class='$column_name column-$column_name'"; + if( $primary == $column_name ) { + $class = "class='$column_name column-$column_name has-row-actions'"; + } else { + $class = "class='$column_name column-$column_name'"; + } $style = ''; if ( in_array( $column_name, $hidden ) ) @@ -190,36 +198,22 @@ ?>
' . __( 'Edit' ) . ''; - - if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { - $actions['delete'] = '' . __( 'Delete' ) . ''; - } - - /** - * Filter the action links displayed under each user - * in the Network Admin Users list table. - * - * @since 3.2.0 - * - * @param array $actions An array of action links to be displayed. - * Default 'Edit', 'Delete'. - * @param WP_User $user WP_User object. - */ - $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); - echo $this->row_actions( $actions ); + echo $this->handle_actions( $user, $column_name, $primary ); ?> $user->first_name $user->last_name"; + echo "$user->first_name $user->last_name"; + echo $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'email': - echo "$user->user_email"; + echo "$user->user_email"; + echo $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'registered': @@ -228,7 +222,9 @@ else $date = 'Y/m/d \<\b\r \/\> g:i:s a'; - echo "" . mysql2date( $date, $user->user_registered ) . ""; + echo "" . mysql2date( $date, $user->user_registered ); + echo $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'blogs': @@ -280,6 +276,7 @@ echo '
'; } } + echo $this->handle_actions( $user, $column_name, $primary ); ?> "; /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */ echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); + echo $this->handle_actions( $user, $column_name, $primary ); echo ""; break; } @@ -298,4 +296,30 @@ ID ) ) ); + $actions['edit'] = '' . __( 'Edit' ) . ''; + + if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { + $actions['delete'] = '' . __( 'Delete' ) . ''; + } + + /** + * Filter the action links displayed under each user + * in the Network Admin Users list table. + * + * @since 3.2.0 + * + * @param array $actions An array of action links to be displayed. + * Default 'Edit', 'Delete'. + * @param WP_User $user WP_User object. + */ + $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); + return $this->row_actions( $actions ); + } + } } Index: wp-admin/includes/class-wp-plugins-list-table.php =================================================================== --- wp-admin/includes/class-wp-plugins-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-plugins-list-table.php (working copy) @@ -467,7 +467,7 @@ echo ""; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { $style = ''; @@ -479,13 +479,21 @@ echo "$checkbox"; break; case 'name': - echo "$plugin_name"; - echo $this->row_actions( $actions, true ); + if( $primary == $column_name ) { + echo "$plugin_name"; + echo $this->row_actions( $actions, true ); + } else { + echo "$plugin_name"; + } echo ""; break; case 'description': - echo " -
$description
+ if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } + echo "
$description
"; $plugin_meta = array(); @@ -517,6 +525,9 @@ $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status ); echo implode( ' | ', $plugin_meta ); + if( $primary == $column_name ) { + echo $this->row_actions( $actions, true ); + } echo "
"; break; default: @@ -567,4 +578,8 @@ */ do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status ); } + + function get_primary_column() { + return( 'name' ); + } } Index: wp-admin/includes/class-wp-comments-list-table.php =================================================================== --- wp-admin/includes/class-wp-comments-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-comments-list-table.php (working copy) @@ -308,6 +308,10 @@ ); } + function get_primary_column() { + return( 'comment' ); + } + function display() { extract( $this->_args ); @@ -375,21 +379,6 @@ $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); $the_comment_status = wp_get_comment_status( $comment->comment_ID ); - if ( $user_can ) { - $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); - $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); - - $url = "comment.php?c=$comment->comment_ID"; - - $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); - $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); - $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); - $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); - $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); - $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); - $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); - } - echo '
'; $this->column_author( $comment ); echo '
'; @@ -424,71 +413,6 @@ '', 'unapprove' => '', - 'reply' => '', - 'quickedit' => '', - 'edit' => '', - 'spam' => '', 'unspam' => '', - 'trash' => '', 'untrash' => '', 'delete' => '' - ); - - if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments - if ( 'approved' == $the_comment_status ) - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - else if ( 'unapproved' == $the_comment_status ) - $actions['approve'] = "" . __( 'Approve' ) . ''; - } else { - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - } - - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - } elseif ( 'spam' == $the_comment_status ) { - $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; - } elseif ( 'trash' == $the_comment_status ) { - $actions['untrash'] = "" . __( 'Restore' ) . ''; - } - - if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; - } else { - $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; - } - - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['edit'] = "". __( 'Edit' ) . ''; - $actions['quickedit'] = '' . __( 'Quick Edit' ) . ''; - $actions['reply'] = '' . __( 'Reply' ) . ''; - } - - /** This filter is documented in wp-admin/includes/dashboard.php */ - $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); - - $i = 0; - echo '
'; - foreach ( $actions as $action => $link ) { - ++$i; - ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; - - // Reply and quickedit need a hide-if-no-js span when not added with ajax - if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) - $action .= ' hide-if-no-js'; - elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { - if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) - $action .= ' approve'; - else - $action .= ' unapprove'; - } - - echo "$sep$link"; - } - echo '
'; - } } function column_author( $comment ) { @@ -564,6 +488,97 @@ */ do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID ); } + + function handle_actions( $comment, $column_name, $primary ) { + global $comment_status; + $post = get_post(); + + $user_can = $this->user_can; + + $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); + $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + + if( $primary == $column_name ) { + if ( $user_can ) { + $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); + $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + + $url = "comment.php?c=$comment->comment_ID"; + + $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); + $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); + $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); + $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); + $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); + $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); + $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + + // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash + $actions = array( + 'approve' => '', 'unapprove' => '', + 'reply' => '', + 'quickedit' => '', + 'edit' => '', + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' + ); + + if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments + if ( 'approved' == $the_comment_status ) + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + else if ( 'unapproved' == $the_comment_status ) + $actions['approve'] = "" . __( 'Approve' ) . ''; + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } + + if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + } elseif ( 'spam' == $the_comment_status ) { + $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; + } elseif ( 'trash' == $the_comment_status ) { + $actions['untrash'] = "" . __( 'Restore' ) . ''; + } + + if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { + $actions['edit'] = "". __( 'Edit' ) . ''; + $actions['quickedit'] = '' . __( 'Quick Edit' ) . ''; + $actions['reply'] = '' . __( 'Reply' ) . ''; + } + + /** This filter is documented in wp-admin/includes/dashboard.php */ + $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); + + $i = 0; + $actions_handled = '
'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) + $action .= ' hide-if-no-js'; + elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { + if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) + $action .= ' approve'; + else + $action .= ' unapprove'; + } + + $actions_handled .= "$sep$link"; + } + $actions_handled .= '
'; + return( $actions_handled ); + } + } + } } /** Index: wp-admin/includes/class-wp-ms-sites-list-table.php =================================================================== --- wp-admin/includes/class-wp-ms-sites-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-ms-sites-list-table.php (working copy) @@ -177,6 +177,10 @@ ); } + function get_primary_column() { + return( 'blogname' ); + } + function display_rows() { global $mode; @@ -214,7 +218,7 @@ $blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path']; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { $style = ''; @@ -240,7 +244,12 @@ break; case 'blogname': - echo ""; ?> + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } + ?> '', 'backend' => '', - 'activate' => '', 'deactivate' => '', - 'archive' => '', 'unarchive' => '', - 'spam' => '', 'unspam' => '', - 'delete' => '', - 'visit' => '', - ); + echo $this->handle_actions( $blog, $column_name, $primary ); - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['backend'] = "" . __( 'Dashboard' ) . ''; - if ( get_current_site()->blog_id != $blog['blog_id'] ) { - if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) - $actions['activate'] = '' . __( 'Activate' ) . ''; - else - $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; - - if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) - $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; - else - $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; - - if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' ) - $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . ''; - else - $actions['spam'] = '' . _x( 'Spam', 'site' ) . ''; - - if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) - $actions['delete'] = '' . __( 'Delete' ) . ''; - } - - $actions['visit'] = "" . __( 'Visit' ) . ''; - - /** - * Filter the action links displayed for each site in the Sites list table. - * - * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by - * default for each site. The site's status determines whether to show the - * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and - * 'Not Spam' or 'Spam' link for each site. - * - * @since 3.1.0 - * - * @param array $actions An array of action links to be displayed. - * @param int $blog_id The site ID. - * @param string $blogname Site path, formatted depending on whether it is a sub-domain - * or subdirectory multisite install. - */ - $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); - echo $this->row_actions( $actions ); ?> "; + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } if ( 'list' == $mode ) $date = 'Y/m/d'; else $date = 'Y/m/d \<\b\r \/\> g:i:s a'; - echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); ?> + echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); + echo $this->handle_actions( $blog, $column_name, $primary ); + ?> "; + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } if ( $blog['registered'] == '0000-00-00 00:00:00' ) echo '—'; else echo mysql2date( $date, $blog['registered'] ); + + echo $this->handle_actions( $blog, $column_name, $primary ); ?> "; + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) ); if ( is_array( $blogusers ) ) { $blogusers_warning = ''; @@ -343,6 +319,7 @@ if ( $blogusers_warning != '' ) echo '' . $blogusers_warning . '
'; } + echo $this->handle_actions( $blog, $column_name, $primary ); ?> "; + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } /** * Fires inside the auxiliary 'Actions' column of the Sites list table. * @@ -360,13 +341,18 @@ * * @param int $blog_id The site ID. */ - do_action( 'wpmublogsaction', $blog['blog_id'] ); ?> + do_action( 'wpmublogsaction', $blog['blog_id'] ); + echo $this->handle_actions( $blog, $column_name, $primary ); ?> "; + if( $primary == $column_name ) { + echo ""; + } else { + echo ""; + } /** * Fires for each registered custom column in the Sites list table. * @@ -376,6 +362,7 @@ * @param int $blog_id The site ID. */ do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] ); + echo $this->handle_actions( $blog, $column_name, $primary ); echo ""; break; } @@ -385,4 +372,62 @@ domain, '', $blog['domain'] ) : $blog['path']; + // Preordered. + $actions = array( + 'edit' => '', 'backend' => '', + 'activate' => '', 'deactivate' => '', + 'archive' => '', 'unarchive' => '', + 'spam' => '', 'unspam' => '', + 'delete' => '', + 'visit' => '', + ); + + $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['backend'] = "" . __( 'Dashboard' ) . ''; + if ( get_current_site()->blog_id != $blog['blog_id'] ) { + if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) + $actions['activate'] = '' . __( 'Activate' ) . ''; + else + $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; + + if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) + $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; + else + $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; + + if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' ) + $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . ''; + else + $actions['spam'] = '' . _x( 'Spam', 'site' ) . ''; + + if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) + $actions['delete'] = '' . __( 'Delete' ) . ''; + } + + $actions['visit'] = "" . __( 'Visit' ) . ''; + + /** + * Filter the action links displayed for each site in the Sites list table. + * + * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by + * default for each site. The site's status determines whether to show the + * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and + * 'Not Spam' or 'Spam' link for each site. + * + * @since 3.1.0 + * + * @param array $actions An array of action links to be displayed. + * @param int $blog_id The site ID. + * @param string $blogname Site path, formatted depending on whether it is a sub-domain + * or subdirectory multisite install. + */ + $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); + return( $this->row_actions( $actions ) ); + } + } } Index: wp-admin/includes/class-wp-posts-list-table.php =================================================================== --- wp-admin/includes/class-wp-posts-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-posts-list-table.php (working copy) @@ -553,10 +553,14 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; + if ( $primary == $column_name ) { + $class = "class=\"$column_name column-$column_name has-row-actions\""; + } else { + $class = "class=\"$column_name column-$column_name\""; + } $style = ''; if ( in_array( $column_name, $hidden ) ) @@ -584,7 +588,13 @@ break; case 'title': - $attributes = 'class="post-title page-title column-title"' . $style; + if ( $primary == $column_name ) { + $attributes = 'class="post-title page-title column-title has_row_actions"'; + } else { + $attributes = 'class="post-title page-title column-title"'; + } + $attributes .= $style; + if ( $this->hierarchical_display ) { if ( 0 == $level && (int) $post->post_parent > 0 ) { //sent level 0 by accident, by default, or because we don't know the actual level @@ -641,65 +651,8 @@ if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) ) the_excerpt(); - $actions = array(); - if ( $can_edit_post && 'trash' != $post->post_status ) { - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; - } - if ( current_user_can( 'delete_post', $post->ID ) ) { - if ( 'trash' == $post->post_status ) - $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; - elseif ( EMPTY_TRASH_DAYS ) - $actions['trash'] = "" . __( 'Trash' ) . ""; - if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) - $actions['delete'] = "" . __( 'Delete Permanently' ) . ""; - } - if ( $post_type_object->public ) { - if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) { - if ( $can_edit_post ) { + echo $this->handle_actions( $post, $column_name, $primary ); - /** This filter is documented in wp-admin/includes/meta-boxes.php */ - $actions['view'] = '' . __( 'Preview' ) . ''; - } - } elseif ( 'trash' != $post->post_status ) { - $actions['view'] = '' . __( 'View' ) . ''; - } - } - - if ( is_post_type_hierarchical( $post->post_type ) ) { - - /** - * Filter the array of row action links on the Pages list table. - * - * The filter is evaluated only for hierarchical post types. - * - * @since 2.8.0 - * - * @param array $actions An array of row action links. Defaults are - * 'Edit', 'Quick Edit', 'Restore, 'Trash', - * 'Delete Permanently', 'Preview', and 'View'. - * @param WP_Post $post The post object. - */ - $actions = apply_filters( 'page_row_actions', $actions, $post ); - } else { - - /** - * Filter the array of row action links on the Posts list table. - * - * The filter is evaluated only for non-hierarchical post types. - * - * @since 2.8.0 - * - * @param array $actions An array of row action links. Defaults are - * 'Edit', 'Quick Edit', 'Restore, 'Trash', - * 'Delete Permanently', 'Preview', and 'View'. - * @param WP_Post $post The post object. - */ - $actions = apply_filters( 'post_row_actions', $actions, $post ); - } - - echo $this->row_actions( $actions ); - get_inline_data( $post ); echo ''; break; @@ -755,6 +708,7 @@ } else { _e( 'Last Modified' ); } + echo $this->handle_actions( $post, $column_name, $primary ); echo ''; break; @@ -766,7 +720,7 @@ $this->comments_bubble( $post->ID, $pending_comments ); ?> - + handle_actions( $post, $column_name, $primary ); ?> $post->post_type, 'author' => get_the_author_meta( 'ID' ) ), 'edit.php' )), get_the_author() ); + echo $this->handle_actions( $post, $column_name, $primary ); ?> handle_actions( $post, $column_name, $primary ); echo ''; break; } @@ -863,6 +819,7 @@ * @param int $post_id The current post ID. */ do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID ); + echo $this->handle_actions( $post, $column_name, $primary ); ?> post_type ); + $can_edit_post = current_user_can( 'edit_post', $post->ID ); + $actions = array(); + if ( $can_edit_post && 'trash' != $post->post_status ) { + $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; + } + if ( current_user_can( 'delete_post', $post->ID ) ) { + if ( 'trash' == $post->post_status ) + $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; + elseif ( EMPTY_TRASH_DAYS ) + $actions['trash'] = "" . __( 'Trash' ) . ""; + if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) + $actions['delete'] = "" . __( 'Delete Permanently' ) . ""; + } + if ( $post_type_object->public ) { + if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) { + if ( $can_edit_post ) { + + /** This filter is documented in wp-admin/includes/meta-boxes.php */ + $actions['view'] = '' . __( 'Preview' ) . ''; + } + } elseif ( 'trash' != $post->post_status ) { + $actions['view'] = '' . __( 'View' ) . ''; + } + } + + if ( is_post_type_hierarchical( $post->post_type ) ) { + + /** + * Filter the array of row action links on the Pages list table. + * + * The filter is evaluated only for hierarchical post types. + * + * @since 2.8.0 + * + * @param array $actions An array of row action links. Defaults are + * 'Edit', 'Quick Edit', 'Restore, 'Trash', + * 'Delete Permanently', 'Preview', and 'View'. + * @param WP_Post $post The post object. + */ + $actions = apply_filters( 'page_row_actions', $actions, $post ); + } else { + + /** + * Filter the array of row action links on the Posts list table. + * + * The filter is evaluated only for non-hierarchical post types. + * + * @since 2.8.0 + * + * @param array $actions An array of row action links. Defaults are + * 'Edit', 'Quick Edit', 'Restore, 'Trash', + * 'Delete Permanently', 'Preview', and 'View'. + * @param WP_Post $post The post object. + */ + $actions = apply_filters( 'post_row_actions', $actions, $post ); + } + + return( $this->row_actions( $actions ) ); + } + } + /** * Outputs the hidden row displayed when inline editing * Index: wp-admin/includes/class-wp-media-list-table.php =================================================================== --- wp-admin/includes/class-wp-media-list-table.php (revision 28046) +++ wp-admin/includes/class-wp-media-list-table.php (working copy) @@ -212,9 +212,13 @@ post_status ); ?>'> get_column_info(); +list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class='$column_name column-$column_name'"; + if( $primary == $column_name ) { + $class = "class='$column_name column-$column_name has-row-actions'"; + } else { + $class = "class='$column_name column-$column_name'"; + } $style = ''; if ( in_array( $column_name, $hidden ) ) @@ -275,7 +279,9 @@ ?>

row_actions( $this->_get_row_actions( $post, $att_title ) ); + if( $primary == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } ?> get_the_author_meta('ID') ), 'upload.php' ) ), get_the_author() ); + if( $primary == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } ?> - >post_excerpt : ''; ?> + >post_excerpt : ''; ?> row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; case 'date': @@ -314,8 +327,12 @@ } } ?> - > + > row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; case 'parent': @@ -336,7 +353,6 @@ echo $title; } ?>, - @@ -346,9 +362,12 @@ onclick="findPosts.open( 'media[]','ID ?>' ); return false;" href="#the-list"> - + row_actions( $this->_get_row_actions( $post, $att_title ) ); + } break; case 'comments': @@ -362,8 +381,11 @@ $this->comments_bubble( $post->ID, $pending_comments ); ?> - row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; default: @@ -396,6 +418,10 @@ } else { echo '—'; } + + if( $primary == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } echo ''; break; } @@ -413,7 +439,11 @@ * @param int $post_id Attachment ID. */ ?> - ID ); ?> + ID ); + if( $primary == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + ?> screen->taxonomy; - $tax = get_taxonomy( $taxonomy ); - $default_term = get_option( 'default_' . $taxonomy ); - $pad = str_repeat( '— ', max( 0, $this->level ) ); /** @@ -289,43 +286,6 @@ $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) ); $out = '' . $name . '
'; - - $actions = array(); - if ( current_user_can( $tax->cap->edit_terms ) ) { - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; - } - if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) - $actions['delete'] = "term_id ) . "'>" . __( 'Delete' ) . ""; - if ( $tax->public ) - $actions['view'] = '' . __( 'View' ) . ''; - - /** - * Filter the action links displayed for each term in the Tags list table. - * - * @since 2.8.0 - * @deprecated 3.0.0 Use {$taxonomy}_row_actions instead. - * - * @param array $actions An array of action links to be displayed. Default - * 'Edit', 'Quick Edit', 'Delete', and 'View'. - * @param object $tag Term object. - */ - $actions = apply_filters( 'tag_row_actions', $actions, $tag ); - - /** - * Filter the action links displayed for each term in the terms list table. - * - * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. - * - * @since 3.0.0 - * - * @param array $actions An array of action links to be displayed. Default - * 'Edit', 'Quick Edit', 'Delete', and 'View'. - * @param object $tag Term object. - */ - $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag ); - - $out .= $this->row_actions( $actions ); $out .= '"; + echo ""; + if( $primary == $column_name ) echo $this->row_actions( $actions, true ); + echo ""; break; default: @@ -410,6 +416,7 @@ * @param WP_Theme $theme Current WP_Theme object. */ do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme ); + if( $primary == $column_name ) echo $this->row_actions( $actions, true ); echo ""; } }