X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/includes/class-wp-posts-list-table.php
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index e623ab59..c772fa63 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -45,17 +45,15 @@ class WP_Posts_List_Table extends WP_List_Table {
*/
var $sticky_posts_count = 0;
- function WP_Posts_List_Table() {
- global $post_type_object, $post_type, $wpdb;
+ function __construct( $args = array() ) {
+ global $post_type_object, $wpdb;
- if ( !isset( $_REQUEST['post_type'] ) )
- $post_type = 'post';
- elseif ( in_array( $_REQUEST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) )
- $post_type = $_REQUEST['post_type'];
- else
- wp_die( __( 'Invalid post type' ) );
- $_REQUEST['post_type'] = $post_type;
+ parent::__construct( array(
+ 'plural' => 'posts',
+ 'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+ ) );
+ $post_type = $this->screen->post_type;
$post_type_object = get_post_type_object( $post_type );
if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
@@ -73,27 +71,22 @@ class WP_Posts_List_Table extends WP_List_Table {
$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status != 'trash' AND ID IN ($sticky_posts)", $post_type ) );
}
-
- parent::WP_List_Table( array(
- 'plural' => 'posts',
- ) );
}
function ajax_user_can() {
- global $post_type_object;
-
- return current_user_can( $post_type_object->cap->edit_posts );
+ return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
}
function prepare_items() {
- global $post_type_object, $post_type, $avail_post_stati, $wp_query, $per_page, $mode;
+ global $avail_post_stati, $wp_query, $per_page, $mode;
$avail_post_stati = wp_edit_posts_query();
- $this->hierarchical_display = ( $post_type_object->hierarchical && 'menu_order title' == $wp_query->query['orderby'] );
+ $this->hierarchical_display = ( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
$total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
+ $post_type = $this->screen->post_type;
$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
@@ -118,16 +111,16 @@ class WP_Posts_List_Table extends WP_List_Table {
}
function no_items() {
- global $post_type_object;
-
if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
- echo $post_type_object->labels->not_found_in_trash;
+ echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
else
- echo $post_type_object->labels->not_found;
+ echo get_post_type_object( $this->screen->post_type )->labels->not_found;
}
function get_views() {
- global $post_type, $post_type_object, $locked_post_status, $avail_post_stati;
+ global $locked_post_status, $avail_post_stati;
+
+ $post_type = $this->screen->post_type;
if ( !empty($locked_post_status) )
return array();
@@ -202,15 +195,15 @@ class WP_Posts_List_Table extends WP_List_Table {
}
function extra_tablenav( $which ) {
- global $post_type, $post_type_object, $cat;
+ global $cat;
?>
months_dropdown( $post_type );
+ $this->months_dropdown( $this->screen->post_type );
- if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+ if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
$dropdown_options = array(
'show_option_all' => __( 'View all categories' ),
'hide_empty' => 0,
@@ -222,11 +215,11 @@ class WP_Posts_List_Table extends WP_List_Table {
wp_dropdown_categories( $dropdown_options );
}
do_action( 'restrict_manage_posts' );
- submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+ submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
}
- if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
- submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
+ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
+ submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
}
?>
@@ -241,27 +234,20 @@ class WP_Posts_List_Table extends WP_List_Table {
}
function pagination( $which ) {
- global $post_type_object, $mode;
+ global $mode;
parent::pagination( $which );
- if ( 'top' == $which && !$post_type_object->hierarchical )
+ if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
$this->view_switcher( $mode );
}
function get_table_classes() {
- global $post_type_object;
-
- return array( 'widefat', 'fixed', $post_type_object->hierarchical ? 'pages' : 'posts' );
+ return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
}
function get_columns() {
- $screen = get_current_screen();
-
- if ( empty( $screen ) )
- $post_type = 'post';
- else
- $post_type = $screen->post_type;
+ $post_type = $this->screen->post_type;
$posts_columns = array();
@@ -273,15 +259,28 @@ class WP_Posts_List_Table extends WP_List_Table {
if ( post_type_supports( $post_type, 'author' ) )
$posts_columns['author'] = __( 'Author' );
- if ( empty( $post_type ) || is_object_in_taxonomy( $post_type, 'category' ) )
- $posts_columns['categories'] = __( 'Categories' );
+ $taxonomies = array();
+
+ $taxonomies = get_object_taxonomies( $post_type, 'objects' );
+ $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
- if ( empty( $post_type ) || is_object_in_taxonomy( $post_type, 'post_tag' ) )
- $posts_columns['tags'] = __( 'Tags' );
+ $taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
+ $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+
+ foreach ( $taxonomies as $taxonomy ) {
+ if ( 'category' == $taxonomy )
+ $column_key = 'categories';
+ elseif ( 'post_tag' == $taxonomy )
+ $column_key = 'tags';
+ else
+ $column_key = 'taxonomy-' . $taxonomy;
+
+ $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+ }
$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
- $posts_columns['comments'] = '
get_column_info();
@@ -497,7 +494,12 @@ class WP_Posts_List_Table extends WP_List_Table {
case 'cb':
?>
- |
+
+
+
+
+
+ |
post_parent;
while ( $find_main_page > 0 ) {
- $parent = get_page( $find_main_page );
+ $parent = get_post( $find_main_page );
if ( is_null( $parent ) )
break;
@@ -522,7 +524,6 @@ class WP_Posts_List_Table extends WP_List_Table {
}
}
- $post->post_title = esc_html( $post->post_title );
$pad = str_repeat( '— ', $level );
?>
>post_status != 'trash' ) { ?>labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?>
@@ -530,12 +531,13 @@ class WP_Posts_List_Table extends WP_List_Table {
}
else {
$attributes = 'class="post-title page-title column-title"' . $style;
+
+ $pad = str_repeat( '— ', $level );
?>
- | >post_status != 'trash' ) { ?>
+ | >post_status != 'trash' ) { ?>
ID ) )
the_excerpt();
- }
}
$actions = array();
@@ -545,17 +547,19 @@ class WP_Posts_List_Table extends WP_List_Table {
}
if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
if ( 'trash' == $post->post_status )
- $actions['untrash'] = "ID ) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>" . __( 'Restore' ) . "";
+ $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 ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
- if ( $can_edit_post )
- $actions['view'] = '' . __( 'Preview' ) . '';
- } elseif ( 'trash' != $post->post_status ) {
- $actions['view'] = '' . __( 'View' ) . '';
+ 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 );
@@ -566,7 +570,7 @@ class WP_Posts_List_Table extends WP_List_Table {
break;
case 'date':
- if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
+ if ( '0000-00-00 00:00:00' == $post->post_date ) {
$t_time = $h_time = __( 'Unpublished' );
$time_diff = 0;
} else {
@@ -576,7 +580,7 @@ class WP_Posts_List_Table extends WP_List_Table {
$time_diff = time() - $time;
- if ( $time_diff > 0 && $time_diff < 24*60*60 )
+ if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS )
$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
else
$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
@@ -601,46 +605,6 @@ class WP_Posts_List_Table extends WP_List_Table {
echo ' | ';
break;
- case 'categories':
- ?>
- >%s',
- esc_url( add_query_arg( array( 'post_type' => $post->post_type, 'category_name' => $c->slug ), 'edit.php' ) ),
- esc_html( sanitize_term_field( 'name', $c->name, $c->term_id, 'category', 'display' ) )
- );
- }
- echo join( ', ', $out );
- } else {
- _e( 'Uncategorized' );
- }
- ?> |
-
- >ID );
- if ( !empty( $tags ) ) {
- $out = array();
- foreach ( $tags as $c ) {
- $out[] = sprintf( '%s',
- esc_url( add_query_arg( array( 'post_type' => $post->post_type, 'tag' => $c->slug ), 'edit.php' ) ),
- esc_html( sanitize_term_field( 'name', $c->name, $c->term_id, 'tag', 'display' ) )
- );
- }
- echo join( ', ', $out );
- } else {
- _e( 'No Tags' );
- }
- ?> |
-
>
@@ -665,6 +629,44 @@ class WP_Posts_List_Table extends WP_List_Table {
break;
default:
+ if ( 'categories' == $column_name )
+ $taxonomy = 'category';
+ elseif ( 'tags' == $column_name )
+ $taxonomy = 'post_tag';
+ elseif ( 0 === strpos( $column_name, 'taxonomy-' ) )
+ $taxonomy = substr( $column_name, 9 );
+ else
+ $taxonomy = false;
+
+ if ( $taxonomy ) {
+ $taxonomy_object = get_taxonomy( $taxonomy );
+ echo ' ';
+ if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
+ $out = array();
+ foreach ( $terms as $t ) {
+ $posts_in_term_qv = array();
+ if ( 'post' != $post->post_type )
+ $posts_in_term_qv['post_type'] = $post->post_type;
+ if ( $taxonomy_object->query_var ) {
+ $posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+ } else {
+ $posts_in_term_qv['taxonomy'] = $taxonomy;
+ $posts_in_term_qv['term'] = $t->slug;
+ }
+
+ $out[] = sprintf( '%s',
+ esc_url( add_query_arg( $posts_in_term_qv, 'edit.php' ) ),
+ esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
+ );
+ }
+ /* translators: used between list items, there is a space after the comma */
+ echo join( __( ', ' ), $out );
+ } else {
+ echo '—';
+ }
+ echo ' | ';
+ break;
+ }
?>
>post_type ) )
@@ -675,12 +677,12 @@ class WP_Posts_List_Table extends WP_List_Table {
?> |
|
screen;
$post = get_default_post_to_edit( $screen->post_type );
$post_type_object = get_post_type_object( $screen->post_type );
@@ -723,8 +725,8 @@ class WP_Posts_List_Table extends WP_List_Table {
$bulk = 0;
while ( $bulk < 2 ) { ?>
- post_type;
+ echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
?>" style="display: none">
-
+
-
-
+
+
's' ) );
} ?>
+
|
@@ -1015,5 +1059,3 @@ class WP_Posts_List_Table extends WP_List_Table {