X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..4ea0dca21bda49aab5ccb91ec12bb4ef5924ed3e:/wp-admin/includes/class-wp-posts-list-table.php?ds=sidebyside
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index d52ebc98..4e1ba34f 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -72,8 +72,8 @@ class WP_Posts_List_Table extends WP_List_Table {
*
* @see WP_List_Table::__construct() for more information on default arguments.
*
- * @global object $post_type_object
- * @global wpdb $wpdb
+ * @global WP_Post_Type $post_type_object
+ * @global wpdb $wpdb
*
* @param array $args An associative array of arguments.
*/
@@ -174,9 +174,9 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( ! empty( $_REQUEST['mode'] ) ) {
$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
- set_user_setting ( 'posts_list_mode', $mode );
+ set_user_setting( 'posts_list_mode', $mode );
} else {
- $mode = get_user_setting ( 'posts_list_mode', 'list' );
+ $mode = get_user_setting( 'posts_list_mode', 'list' );
}
$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
@@ -412,31 +412,57 @@ class WP_Posts_List_Table extends WP_List_Table {
}
/**
- * @global int $cat
+ * Displays a categories drop-down for filtering on the Posts list table.
+ *
+ * @since 4.6.0
+ * @access protected
+ *
+ * @global int $cat Currently selected category.
+ *
+ * @param string $post_type Post type slug.
+ */
+ protected function categories_dropdown( $post_type ) {
+ global $cat;
+
+ /**
+ * Filters whether to remove the 'Categories' drop-down from the post list table.
+ *
+ * @since 4.6.0
+ *
+ * @param bool $disable Whether to disable the categories drop-down. Default false.
+ * @param string $post_type Post type slug.
+ */
+ if ( false !== apply_filters( 'disable_categories_dropdown', false, $post_type ) ) {
+ return;
+ }
+
+ if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+ $dropdown_options = array(
+ 'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
+ 'hide_empty' => 0,
+ 'hierarchical' => 1,
+ 'show_count' => 0,
+ 'orderby' => 'name',
+ 'selected' => $cat
+ );
+
+ echo '';
+ wp_dropdown_categories( $dropdown_options );
+ }
+ }
+
+ /**
* @param string $which
*/
protected function extra_tablenav( $which ) {
- global $cat;
?>
months_dropdown( $this->screen->post_type );
-
- if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
- $dropdown_options = array(
- 'show_option_all' => __( 'All categories' ),
- 'hide_empty' => 0,
- 'hierarchical' => 1,
- 'show_count' => 0,
- 'orderby' => 'name',
- 'selected' => $cat
- );
-
- echo '
';
- wp_dropdown_categories( $dropdown_options );
- }
+ $this->categories_dropdown( $this->screen->post_type );
/**
* Fires before the Filter button on the Posts and Pages list tables.
@@ -446,12 +472,20 @@ class WP_Posts_List_Table extends WP_List_Table {
*
* @since 2.1.0
* @since 4.4.0 The `$post_type` parameter was added.
+ * @since 4.6.0 The `$which` parameter was added.
*
* @param string $post_type The post type slug.
+ * @param string $which The location of the extra table nav markup:
+ * 'top' or 'bottom'.
*/
- do_action( 'restrict_manage_posts', $this->screen->post_type );
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+
+ $output = ob_get_clean();
- submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ if ( ! empty( $output ) ) {
+ echo $output;
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ }
}
if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
@@ -512,7 +546,7 @@ class WP_Posts_List_Table extends WP_List_Table {
$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
/**
- * Filter the taxonomy columns in the Posts list table.
+ * Filters the taxonomy columns in the Posts list table.
*
* The dynamic portion of the hook name, `$post_type`, refers to the post
* type slug.
@@ -545,7 +579,7 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( 'page' === $post_type ) {
/**
- * Filter the columns displayed in the Pages list table.
+ * Filters the columns displayed in the Pages list table.
*
* @since 2.5.0
*
@@ -555,7 +589,7 @@ class WP_Posts_List_Table extends WP_List_Table {
} else {
/**
- * Filter the columns displayed in the Posts list table.
+ * Filters the columns displayed in the Posts list table.
*
* @since 1.5.0
*
@@ -566,7 +600,7 @@ class WP_Posts_List_Table extends WP_List_Table {
}
/**
- * Filter the columns displayed in the Posts list table for a specific post type.
+ * Filters the columns displayed in the Posts list table for a specific post type.
*
* The dynamic portion of the hook name, `$post_type`, refers to the post type slug.
*
@@ -801,7 +835,16 @@ class WP_Posts_List_Table extends WP_List_Table {
printf( __( 'Select %s' ), _draft_or_post_title() );
?>
-
+
+
+
+
ID );
+
+ if ( $can_edit_post && $post->post_status != 'trash' ) {
+ $lock_holder = wp_check_post_lock( $post->ID );
+
+ if ( $lock_holder ) {
+ $lock_holder = get_userdata( $lock_holder );
+ $locked_avatar = get_avatar( $lock_holder->ID, 18 );
+ $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+ } else {
+ $locked_avatar = $locked_text = '';
+ }
+
+ echo '
' . $locked_avatar . ' ' . $locked_text . "
\n";
+ }
+
$pad = str_repeat( '— ', $this->current_level );
echo "
";
@@ -873,12 +932,17 @@ class WP_Posts_List_Table extends WP_List_Table {
echo $this->get_edit_link( $format_args, $label . ':', $format_class );
}
- $can_edit_post = current_user_can( 'edit_post', $post->ID );
$title = _draft_or_post_title();
if ( $can_edit_post && $post->post_status != 'trash' ) {
- $edit_link = get_edit_post_link( $post->ID );
- echo '' . $pad . $title . '';
+ printf(
+ '%s%s',
+ get_edit_post_link( $post->ID ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( '“%s” (Edit)' ), $title ) ),
+ $pad,
+ $title
+ );
} else {
echo $pad . $title;
}
@@ -890,22 +954,8 @@ class WP_Posts_List_Table extends WP_List_Table {
}
echo "\n";
- if ( $can_edit_post && $post->post_status != 'trash' ) {
- $lock_holder = wp_check_post_lock( $post->ID );
-
- if ( $lock_holder ) {
- $lock_holder = get_userdata( $lock_holder );
- $locked_avatar = get_avatar( $lock_holder->ID, 18 );
- $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
- } else {
- $locked_avatar = $locked_text = '';
- }
-
- echo '
' . $locked_avatar . ' ' . $locked_text . "
\n";
- }
-
if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
- the_excerpt();
+ echo esc_html( get_the_excerpt() );
}
get_inline_data( $post );
@@ -955,7 +1005,7 @@ class WP_Posts_List_Table extends WP_List_Table {
echo '
';
if ( 'excerpt' === $mode ) {
/**
- * Filter the published time of the post.
+ * Filters the published time of the post.
*
* If `$mode` equals 'excerpt', the published time and date are both displayed.
* If `$mode` equals 'list' (default), the publish date is displayed, with the
@@ -1169,38 +1219,80 @@ class WP_Posts_List_Table extends WP_List_Table {
$post_type_object = get_post_type_object( $post->post_type );
$can_edit_post = current_user_can( 'edit_post', $post->ID );
$actions = array();
+ $title = _draft_or_post_title();
if ( $can_edit_post && 'trash' != $post->post_status ) {
- $actions['edit'] = '
' . __( 'Edit' ) . '';
- $actions['inline hide-if-no-js'] = '
' . __( 'Quick Edit' ) . '';
+ $actions['edit'] = sprintf(
+ '
%s',
+ get_edit_post_link( $post->ID ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ),
+ __( 'Edit' )
+ );
+ $actions['inline hide-if-no-js'] = sprintf(
+ '
%s',
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Quick edit “%s” inline' ), $title ) ),
+ __( '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 ( 'trash' === $post->post_status ) {
+ $actions['untrash'] = sprintf(
+ '
%s',
+ wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Restore “%s” from the Trash' ), $title ) ),
+ __( 'Restore' )
+ );
+ } elseif ( EMPTY_TRASH_DAYS ) {
+ $actions['trash'] = sprintf(
+ '
%s',
+ get_delete_post_link( $post->ID ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $title ) ),
+ _x( 'Trash', 'verb' )
+ );
+ }
+ if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+ $actions['delete'] = sprintf(
+ '
%s',
+ get_delete_post_link( $post->ID, '', true ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Delete “%s” permanently' ), $title ) ),
+ __( 'Delete Permanently' )
+ );
+ }
}
if ( is_post_type_viewable( $post_type_object ) ) {
- $title = _draft_or_post_title();
if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
if ( $can_edit_post ) {
- $unpublished_link = set_url_scheme( get_permalink( $post ) );
- $preview_link = get_preview_post_link( $post, array(), $unpublished_link );
- $actions['view'] = '
' . __( 'Preview' ) . '';
+ $preview_link = get_preview_post_link( $post );
+ $actions['view'] = sprintf(
+ '
%s',
+ esc_url( $preview_link ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Preview “%s”' ), $title ) ),
+ __( 'Preview' )
+ );
}
} elseif ( 'trash' != $post->post_status ) {
- $actions['view'] = '
' . __( 'View' ) . '';
+ $actions['view'] = sprintf(
+ '
%s',
+ get_permalink( $post->ID ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'View “%s”' ), $title ) ),
+ __( 'View' )
+ );
}
}
if ( is_post_type_hierarchical( $post->post_type ) ) {
/**
- * Filter the array of row action links on the Pages list table.
+ * Filters the array of row action links on the Pages list table.
*
* The filter is evaluated only for hierarchical post types.
*
@@ -1215,7 +1307,7 @@ class WP_Posts_List_Table extends WP_List_Table {
} else {
/**
- * Filter the array of row action links on the Posts list table.
+ * Filters the array of row action links on the Posts list table.
*
* The filter is evaluated only for non-hierarchical post types.
*
@@ -1257,7 +1349,7 @@ class WP_Posts_List_Table extends WP_List_Table {
$show_in_quick_edit = $taxonomy->show_in_quick_edit;
/**
- * Filter whether the current taxonomy should be shown in the Quick Edit panel.
+ * Filters whether the current taxonomy should be shown in the Quick Edit panel.
*
* @since 4.2.0
*
@@ -1335,7 +1427,8 @@ class WP_Posts_List_Table extends WP_List_Table {
'name' => 'post_author',
'class'=> 'authors',
'multi' => 1,
- 'echo' => 0
+ 'echo' => 0,
+ 'show' => 'display_name_with_login',
);
if ( $bulk )
$users_opt['show_option_none'] = __( '— No Change —' );
@@ -1355,7 +1448,7 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( !$bulk && $can_publish ) :
?>
-
+
- post_type ) :
- ?>
-
-
-
+ post_type ) ) ) : ?>
+
+
+
- cap->assign_terms ) ) : ?>
+ cap->assign_terms ) ) :
+ $taxonomy_name = esc_attr( $taxonomy->name );
+
+ ?>
@@ -1487,7 +1580,7 @@ class WP_Posts_List_Table extends WP_List_Table {
post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
if ( $bulk ) : ?>
-
+
post_type, 'comments' ) ) : ?>