WordPress 4.4

[autoinstalls/wordpress.git] / wp-admin / includes / list-table.php

diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index 2dff578e0db2bf85a5cf67471d6102fe85721dc0..8120598a600079d3120710a505fb69e3e631b0d6 100644 (file)
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -13,10 +13,13 @@
  * @access private
  * @since 3.1.0
  *
+ * @global string $hook_suffix
+ *
  * @param string $class The type of the list table, which is the class name.
+ * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
  * @return object|bool Object on success, false if the class does not exist.
  */
-function _get_list_table( $class ) {
+function _get_list_table( $class, $args = array() ) {
        $core_classes = array(
                //Site Admin
                'WP_Posts_List_Table' => 'posts',
@@ -24,7 +27,7 @@ function _get_list_table( $class ) {
                'WP_Terms_List_Table' => 'terms',
                'WP_Users_List_Table' => 'users',
                'WP_Comments_List_Table' => 'comments',
-               'WP_Post_Comments_List_Table' => 'comments',
+               'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
                'WP_Links_List_Table' => 'links',
                'WP_Plugin_Install_List_Table' => 'plugin-install',
                'WP_Themes_List_Table' => 'themes',
@@ -39,7 +42,15 @@ function _get_list_table( $class ) {
        if ( isset( $core_classes[ $class ] ) ) {
                foreach ( (array) $core_classes[ $class ] as $required )
                        require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
-               return new $class;
+
+               if ( isset( $args['screen'] ) )
+                       $args['screen'] = convert_to_screen( $args['screen'] );
+               elseif ( isset( $GLOBALS['hook_suffix'] ) )
+                       $args['screen'] = get_current_screen();
+               else
+                       $args['screen'] = null;
+
+               return new $class( $args );
        }
 
        return false;
@@ -75,10 +86,10 @@ function print_column_headers($screen, $id = true) {
  * @since 3.1.0
  */
 class _WP_List_Table_Compat extends WP_List_Table {
-       var $_screen;
-       var $_columns;
+       public $_screen;
+       public $_columns;
 
-       function _WP_List_Table_Compat( $screen, $columns = array() ) {
+       public function __construct( $screen, $columns = array() ) {
                if ( is_string( $screen ) )
                        $screen = convert_to_screen( $screen );
 
@@ -86,19 +97,30 @@ class _WP_List_Table_Compat extends WP_List_Table {
 
                if ( !empty( $columns ) ) {
                        $this->_columns = $columns;
-                       add_filter( 'manage_' . $screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
+                       add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
                }
        }
 
-       function get_column_info() {
+       /**
+        * @access protected
+        *
+        * @return array
+        */
+       protected function get_column_info() {
                $columns = get_column_headers( $this->_screen );
                $hidden = get_hidden_columns( $this->_screen );
                $sortable = array();
+               $primary = $this->get_default_primary_column_name();
 
-               return array( $columns, $hidden, $sortable );
+               return array( $columns, $hidden, $sortable, $primary );
        }
 
-       function get_columns() {
+       /**
+        * @access public
+        *
+        * @return array
+        */
+       public function get_columns() {
                return $this->_columns;
        }
 }