WordPress 4.0

[autoinstalls/wordpress.git] / 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 1e763f2ff33ef32790b4d5262b43ff5c19be43af..5914aea92e6f7128b51ee79441475623a8c909fb 100644 (file)
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -16,7 +16,7 @@ class WP_Posts_List_Table extends WP_List_Table {
         * @var bool
         * @access protected
         */
         * @var bool
         * @access protected
         */

-       var $hierarchical_display;
+       protected $hierarchical_display;

 
        /**
         * Holds the number of pending comments for each post
 
        /**
         * Holds the number of pending comments for each post


@@ -25,7 +25,7 @@ class WP_Posts_List_Table extends WP_List_Table {
         * @var int
         * @access protected
         */
         * @var int
         * @access protected
         */

-       var $comment_pending_count;
+       protected $comment_pending_count;

 
        /**
         * Holds the number of posts for this user
 
        /**
         * Holds the number of posts for this user


@@ -34,7 +34,7 @@ class WP_Posts_List_Table extends WP_List_Table {
         * @var int
         * @access private
         */
         * @var int
         * @access private
         */

-       var $user_posts_count;
+       private $user_posts_count;

 
        /**
         * Holds the number of posts which are sticky.
 
        /**
         * Holds the number of posts which are sticky.


@@ -43,9 +43,19 @@ class WP_Posts_List_Table extends WP_List_Table {
         * @var int
         * @access private
         */
         * @var int
         * @access private
         */

-       var $sticky_posts_count = 0;
+       private $sticky_posts_count = 0;

 
 

-       function __construct( $args = array() ) {
+       /**
+        * Constructor.
+        *
+        * @since 3.1.0
+        * @access public
+        *
+        * @see WP_List_Table::__construct() for more information on default arguments.
+        *
+        * @param array $args An associative array of arguments.
+        */
+       public function __construct( $args = array() ) {

                global $post_type_object, $wpdb;
 
                parent::__construct( array(
                global $post_type_object, $wpdb;
 
                parent::__construct( array(


@@ -74,11 +84,11 @@ class WP_Posts_List_Table extends WP_List_Table {
                }
        }
 
                }
        }
 

-       function ajax_user_can() {
+       public function ajax_user_can() {

                return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
        }
 
                return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
        }
 

-       function prepare_items() {
+       public function prepare_items() {

                global $avail_post_stati, $wp_query, $per_page, $mode;
 
                $avail_post_stati = wp_edit_posts_query();
                global $avail_post_stati, $wp_query, $per_page, $mode;
 
                $avail_post_stati = wp_edit_posts_query();


@@ -98,7 +108,12 @@ class WP_Posts_List_Table extends WP_List_Table {
                else
                        $total_pages = $wp_query->max_num_pages;
 
                else
                        $total_pages = $wp_query->max_num_pages;
 

-               $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+               if ( ! empty( $_REQUEST['mode'] ) ) {
+                       $mode = $_REQUEST['mode'] == 'excerpt' ? 'excerpt' : 'list';
+                       set_user_setting ( 'posts_list_mode', $mode );
+               } else {
+                       $mode = get_user_setting ( 'posts_list_mode', 'list' );
+               }

 
                $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
 
 
                $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
 


@@ -109,18 +124,18 @@ class WP_Posts_List_Table extends WP_List_Table {
                ) );
        }
 
                ) );
        }
 

-       function has_items() {
+       public function has_items() {

                return have_posts();
        }
 
                return have_posts();
        }
 

-       function no_items() {
+       public function no_items() {

                if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
                        echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
                else
                        echo get_post_type_object( $this->screen->post_type )->labels->not_found;
        }
 
                if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
                        echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
                else
                        echo get_post_type_object( $this->screen->post_type )->labels->not_found;
        }
 

-       function get_views() {
+       protected function get_views() {

                global $locked_post_status, $avail_post_stati;
 
                $post_type = $this->screen->post_type;
                global $locked_post_status, $avail_post_stati;
 
                $post_type = $this->screen->post_type;


@@ -181,7 +196,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                return $status_links;
        }
 
                return $status_links;
        }
 

-       function get_bulk_actions() {
+       protected function get_bulk_actions() {

                $actions = array();
 
                if ( $this->is_trash )
                $actions = array();
 
                if ( $this->is_trash )


@@ -197,7 +212,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                return $actions;
        }
 
                return $actions;
        }
 

-       function extra_tablenav( $which ) {
+       protected function extra_tablenav( $which ) {

                global $cat;
 ?>
                <div class="alignleft actions">
                global $cat;
 ?>
                <div class="alignleft actions">


@@ -228,7 +243,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                         */
                        do_action( 'restrict_manage_posts' );
 
                         */
                        do_action( 'restrict_manage_posts' );
 

-                       submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+                       submit_button( __( 'Filter' ), 'button', '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 ) ) {
                }
 
                if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {


@@ -239,14 +254,14 @@ class WP_Posts_List_Table extends WP_List_Table {
 <?php
        }
 
 <?php
        }
 

-       function current_action() {
+       public function current_action() {

                if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
                        return 'delete_all';
 
                return parent::current_action();
        }
 
                if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
                        return 'delete_all';
 
                return parent::current_action();
        }
 

-       function pagination( $which ) {
+       protected function pagination( $which ) {

                global $mode;
 
                parent::pagination( $which );
                global $mode;
 
                parent::pagination( $which );


@@ -255,11 +270,11 @@ class WP_Posts_List_Table extends WP_List_Table {
                        $this->view_switcher( $mode );
        }
 
                        $this->view_switcher( $mode );
        }
 

-       function get_table_classes() {
+       protected function get_table_classes() {

                return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
        }
 
                return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
        }
 

-       function get_columns() {
+       public function get_columns() {

                $post_type = $this->screen->post_type;
 
                $posts_columns = array();
                $post_type = $this->screen->post_type;
 
                $posts_columns = array();


@@ -269,10 +284,9 @@ class WP_Posts_List_Table extends WP_List_Table {
                /* translators: manage posts column name */
                $posts_columns['title'] = _x( 'Title', 'column name' );
 
                /* translators: manage posts column name */
                $posts_columns['title'] = _x( 'Title', 'column name' );
 

-               if ( post_type_supports( $post_type, 'author' ) )
+               if ( post_type_supports( $post_type, 'author' ) ) {

                        $posts_columns['author'] = __( 'Author' );
                        $posts_columns['author'] = __( 'Author' );

-
-               $taxonomies = array();
+               }

 
                $taxonomies = get_object_taxonomies( $post_type, 'objects' );
                $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
 
                $taxonomies = get_object_taxonomies( $post_type, 'objects' );
                $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );


@@ -345,7 +359,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                return $posts_columns;
        }
 
                return $posts_columns;
        }
 

-       function get_sortable_columns() {
+       protected function get_sortable_columns() {

                return array(
                        'title'    => 'title',
                        'parent'   => 'parent',
                return array(
                        'title'    => 'title',
                        'parent'   => 'parent',


@@ -354,7 +368,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                );
        }
 
                );
        }
 

-       function display_rows( $posts = array(), $level = 0 ) {
+       public function display_rows( $posts = array(), $level = 0 ) {

                global $wp_query, $per_page;
 
                if ( empty( $posts ) )
                global $wp_query, $per_page;
 
                if ( empty( $posts ) )


@@ -369,7 +383,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                }
        }
 
                }
        }
 

-       function _display_rows( $posts, $level = 0 ) {
+       private function _display_rows( $posts, $level = 0 ) {

                global $mode;
 
                // Create array of post IDs.
                global $mode;
 
                // Create array of post IDs.


@@ -384,7 +398,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                        $this->single_row( $post, $level );
        }
 
                        $this->single_row( $post, $level );
        }
 

-       function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+       private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {

                global $wpdb;
 
                $level = 0;
                global $wpdb;
 
                $level = 0;


@@ -410,7 +424,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
                        foreach ( $pages as $page ) {
 
 
                        foreach ( $pages as $page ) {
 

-                               // catch and repair bad pages
+                               // Catch and repair bad pages.

                                if ( $page->post_parent == $page->ID ) {
                                        $page->post_parent = 0;
                                        $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
                                if ( $page->post_parent == $page->ID ) {
                                        $page->post_parent = 0;
                                        $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );


@@ -445,7 +459,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
                }
 
                                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
                }
 

-               // if it is the last pagenum and there are orphaned pages, display them with paging as well
+               // If it is the last pagenum and there are orphaned pages, display them with paging as well.

                if ( isset( $children_pages ) && $count < $end ){
                        foreach ( $children_pages as $orphans ){
                                foreach ( $orphans as $op ) {
                if ( isset( $children_pages ) && $count < $end ){
                        foreach ( $children_pages as $orphans ){
                                foreach ( $orphans as $op ) {


@@ -476,7 +490,7 @@ class WP_Posts_List_Table extends WP_List_Table {
         * @param int $pagenum
         * @param int $per_page
         */
         * @param int $pagenum
         * @param int $per_page
         */

-       function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
+       private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {

 
                if ( ! isset( $children_pages[$parent] ) )
                        return;
 
                if ( ! isset( $children_pages[$parent] ) )
                        return;


@@ -521,7 +535,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                unset( $children_pages[$parent] ); //required in order to keep track of orphans
        }
 
                unset( $children_pages[$parent] ); //required in order to keep track of orphans
        }
 

-       function single_row( $post, $level = 0 ) {
+       public function single_row( $post, $level = 0 ) {

                global $mode;
                static $alternate;
 
                global $mode;
                static $alternate;
 


@@ -587,7 +601,7 @@ class WP_Posts_List_Table extends WP_List_Table {
                                $attributes = 'class="post-title page-title column-title"' . $style;
                                if ( $this->hierarchical_display ) {
                                        if ( 0 == $level && (int) $post->post_parent > 0 ) {
                                $attributes = 'class="post-title page-title column-title"' . $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
+                                               // Sent level 0 by accident, by default, or because we don't know the actual level.

                                                $find_main_page = (int) $post->post_parent;
                                                while ( $find_main_page > 0 ) {
                                                        $parent = get_post( $find_main_page );
                                                $find_main_page = (int) $post->post_parent;
                                                while ( $find_main_page > 0 ) {
                                                        $parent = get_post( $find_main_page );


@@ -657,9 +671,10 @@ class WP_Posts_List_Table extends WP_List_Table {
                                if ( $post_type_object->public ) {
                                        if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
                                                if ( $can_edit_post ) {
                                if ( $post_type_object->public ) {
                                        if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
                                                if ( $can_edit_post ) {

-
+                                                       $preview_link = set_url_scheme( get_permalink( $post->ID ) );

                                                        /** This filter is documented in wp-admin/includes/meta-boxes.php */
                                                        /** This filter is documented in wp-admin/includes/meta-boxes.php */

-                                                       $actions['view'] = '<a href="' . esc_url( apply_filters( 'preview_post_link', set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
+                                                       $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+                                                       $actions['view'] = '<a href="' . esc_url( $preview_link ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';

                                                }
                                        } elseif ( 'trash' != $post->post_status ) {
                                                $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
                                                }
                                        } elseif ( 'trash' != $post->post_status ) {
                                                $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';


@@ -879,7 +894,7 @@ class WP_Posts_List_Table extends WP_List_Table {
         *
         * @since 3.1.0
         */
         *
         * @since 3.1.0
         */

-       function inline_edit() {
+       public function inline_edit() {

                global $mode;
 
                $screen = $this->screen;
                global $mode;
 
                $screen = $this->screen;