Index: class-wp-comments-list-table.php =================================================================== --- class-wp-comments-list-table.php (revision 25762) +++ class-wp-comments-list-table.php (working copy) @@ -273,6 +273,10 @@ ); } + function get_primary_column() { + return( 'comment' ); + } + function display() { extract( $this->_args ); @@ -381,70 +385,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' ) . ''; - } - - $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 ) { @@ -512,6 +452,81 @@ function column_default( $comment, $column_name ) { 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 ( $user_can ) { + // 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' ) . ''; + } + + $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 '
'; + } + } + } /** Index: class-wp-list-table.php =================================================================== --- class-wp-list-table.php (revision 25762) +++ class-wp-list-table.php (working copy) @@ -600,6 +600,15 @@ } /** + * Get name of primary column. + * + * @return string + */ + function get_primary_column() { + return( '' ); + } + + /** * Get a list of all, hidden and sortable columns, with filter applied * * @since 3.1.0 @@ -628,8 +637,10 @@ $sortable[$id] = $data; } - $this->_column_headers = array( $columns, $hidden, $sortable ); + $primary = $this->get_primary_column(); + $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); + return $this->_column_headers; } @@ -849,10 +860,13 @@ * @param object $item The current item */ function single_row_columns( $item ) { - list( $columns, $hidden ) = $this->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 ) ) @@ -868,6 +882,9 @@ elseif ( method_exists( $this, 'column_' . $column_name ) ) { echo ""; echo call_user_func( array( $this, 'column_' . $column_name ), $item ); + if( $primary == $column_name ) { + echo $this->handle_actions( $item, $column_name, $primary ); + } echo ""; } else { @@ -879,6 +896,12 @@ } /** + * Generate and display row actions links + */ + function handle_actions( $post, $column_name, $primary_column ) { + } + + /** * Handle an incoming ajax request (called from admin-ajax.php) * * @since 3.1.0 Index: class-wp-media-list-table.php =================================================================== --- class-wp-media-list-table.php (revision 25762) +++ class-wp-media-list-table.php (working copy) @@ -194,10 +194,15 @@ post_status ); ?>' valign="top"> get_column_info(); +list( $columns, $hidden, $sortable, $primary_column ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class='$column_name column-$column_name'"; + if( $primary_column == $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 ) ) $style = ' style="display:none;"'; @@ -257,7 +262,9 @@ ?>

row_actions( $this->_get_row_actions( $post, $att_title ) ); + if( $primary_column == $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 == $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': @@ -296,8 +310,12 @@ } } ?> - > + > row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; case 'parent': @@ -318,7 +336,6 @@ echo $title; } ?>, - @@ -328,9 +345,13 @@ onclick="findPosts.open( 'media[]','ID ?>' ); return false;" href="#the-list"> - + row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; case 'comments': @@ -344,8 +365,11 @@ $this->comments_bubble( $post->ID, $pending_comments ); ?> - row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + echo ''; break; default: @@ -378,12 +402,21 @@ } else { echo '—'; } + + if( $primary_column == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } echo ''; break; } ?> > - ID ); ?> +ID ); + if( $primary_column == $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } +?> 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 ) { + $is_primary = ( $primary == $column_name ); $style = ''; if ( in_array( $column_name, $hidden ) ) $style = ' style="display:none;"'; @@ -230,7 +235,12 @@ break; case 'blogname': - echo ""; ?> + if( $is_primary ) { + echo ""; + } else { + echo ""; + } + ?> '', 'backend' => '', - 'activate' => '', 'deactivate' => '', - 'archive' => '', 'unarchive' => '', - 'spam' => '', 'unspam' => '', - 'delete' => '', - 'visit' => '', - ); + $this->handle_actions( $blog, $column_name, $primary ); - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['backend'] = "" . __( 'Dashboard' ) . ''; - if ( $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' ) . ''; - - $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); - echo $this->row_actions( $actions ); ?> 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'] ); + $this->handle_actions( $blog, $column_name, $primary ); + ?> handle_actions( $blog, $column_name, $primary ); ?> ' . $blogusers_warning . '
'; } + $this->handle_actions( $blog, $column_name, $primary ); ?> "; - do_action( 'wpmublogsaction', $blog['blog_id'] ); ?> + do_action( 'wpmublogsaction', $blog['blog_id'] ); + $this->handle_actions( $blog, $column_name, $primary ); + ?> "; do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] ); + $this->handle_actions( $blog, $column_name, $primary ); echo ""; break; } @@ -343,4 +327,47 @@ 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 ( $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' ) . ''; + + $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); + echo $this->row_actions( $actions ); + } + } } Index: class-wp-ms-themes-list-table.php =================================================================== --- class-wp-ms-themes-list-table.php (revision 25762) +++ class-wp-ms-themes-list-table.php (working copy) @@ -182,6 +182,10 @@ ); } + function get_primary_column() { + return( 'name' ); + } + function get_views() { global $totals, $status; @@ -298,9 +302,10 @@ 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 ) { + $is_primary = ( $primary == $column_name ); $style = ''; if ( in_array( $column_name, $hidden ) ) $style = ' style="display:none;"'; @@ -311,7 +316,7 @@ break; case 'name': echo "" . $theme->display('Name') . ""; - echo $this->row_actions( $actions, true ); + if( $is_primary ) echo $this->row_actions( $actions, true ); echo ""; break; case 'description': @@ -335,13 +340,16 @@ $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status ); echo implode( ' | ', $theme_meta ); + echo ""; - echo ""; + if( $is_primary ) echo $this->row_actions( $actions, true ); + echo ""; break; default: echo ""; do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme ); + if( $is_primary ) echo $this->row_actions( $actions, true ); echo ""; } } Index: class-wp-ms-users-list-table.php =================================================================== --- class-wp-ms-users-list-table.php (revision 25762) +++ class-wp-ms-users-list-table.php (working copy) @@ -132,6 +132,10 @@ ); } + function get_primary_column() { + return( 'username' ); + } + function display_rows() { global $current_site, $mode; @@ -151,10 +155,15 @@ 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'"; + $is_primary = ($primary == $column_name); + if( $is_primary ) { + $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 ) ) @@ -182,15 +191,7 @@ ?>
' . __( 'Edit' ) . ''; - - if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { - $actions['delete'] = '' . __( 'Delete' ) . ''; - } - - $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); - echo $this->row_actions( $actions ); + $this->handle_actions( $user, $column_name, $primary ); ?> $user->first_name $user->last_name"; + echo "$user->first_name $user->last_name"; + $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'email': - echo "$user->user_email"; + echo "$user->user_email"; + $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'registered': @@ -210,7 +215,9 @@ else $date = 'Y/m/d \<\b\r \/\> g:i:s a'; - echo "" . mysql2date( $date, $user->user_registered ) . ""; + echo "" . mysql2date( $date, $user->user_registered ); + $this->handle_actions( $user, $column_name, $primary ); + echo ""; break; case 'blogs': @@ -252,6 +259,7 @@ echo '
'; } } + $this->handle_actions( $user, $column_name, $primary ); ?> "; echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); + $this->handle_actions( $user, $column_name, $primary ); echo ""; break; } @@ -269,4 +278,21 @@ ' . __( 'Edit' ) . ''; + + if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { + $actions['delete'] = '' . __( 'Delete' ) . ''; + } + + $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); + echo $this->row_actions( $actions ); + } + } + } Index: class-wp-plugins-list-table.php =================================================================== --- class-wp-plugins-list-table.php (revision 25762) +++ class-wp-plugins-list-table.php (working copy) @@ -384,7 +384,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 = ''; @@ -396,14 +396,22 @@ 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(); if ( !empty( $plugin_data['Version'] ) ) @@ -420,6 +428,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: @@ -434,4 +445,8 @@ do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status ); do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status ); } + + function get_primary_column() { + return( 'name' ); + } } Index: class-wp-posts-list-table.php =================================================================== --- class-wp-posts-list-table.php (revision 25762) +++ class-wp-posts-list-table.php (working copy) @@ -495,11 +495,16 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary_column ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; + if ( $primary_column == $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 ) ) $style = ' style="display:none;"'; @@ -526,7 +531,13 @@ break; case 'title': - $attributes = 'class="post-title page-title column-title"' . $style; + if ( $primary_column == $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 @@ -581,6 +592,7 @@ 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' ) . ''; @@ -605,6 +617,8 @@ $actions = apply_filters( is_post_type_hierarchical( $post->post_type ) ? 'page_row_actions' : 'post_row_actions', $actions, $post ); echo $this->row_actions( $actions ); +*/ + $this->handle_actions( $post, $column_name, $primary_column ); get_inline_data( $post ); echo ''; @@ -643,6 +657,7 @@ } else { _e( 'Last Modified' ); } + $this->handle_actions( $post, $column_name, $primary_column ); echo ''; break; @@ -654,7 +669,7 @@ $this->comments_bubble( $post->ID, $pending_comments ); ?> -
+ handle_actions( $post, $column_name, $primary_column ); ?> $post->post_type, 'author' => get_the_author_meta( 'ID' ) ), 'edit.php' )), get_the_author() ); + $this->handle_actions( $post, $column_name, $primary_column ); ?> handle_actions( $post, $column_name, $primary_column ); echo ''; break; } @@ -715,6 +733,7 @@ else do_action( 'manage_posts_custom_column', $column_name, $post->ID ); do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID ); + $this->handle_actions( $post, $column_name, $primary_column ); ?> 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 ) + $actions['view'] = '' . __( 'Preview' ) . ''; + } elseif ( 'trash' != $post->post_status ) { + $actions['view'] = '' . __( 'View' ) . ''; + } + } + + $actions = apply_filters( is_post_type_hierarchical( $post->post_type ) ? 'page_row_actions' : 'post_row_actions', $actions, $post ); + echo $this->row_actions( $actions ); + } + } + /** * Outputs the hidden row displayed when inline editing * Index: class-wp-terms-list-table.php =================================================================== --- class-wp-terms-list-table.php (revision 25762) +++ class-wp-terms-list-table.php (working copy) @@ -252,20 +252,6 @@ $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' ) . ''; - - $actions = apply_filters( 'tag_row_actions', $actions, $tag ); - $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag ); - - $out .= $this->row_actions( $actions ); $out .= '