WordPress 4.1.3

[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..04b552f1b3ef805d2129e45e93d57e3b40607b8f 100644 (file)
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -14,9 +14,10 @@
  * @since 3.1.0
  *
  * @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',
@@ -39,7 +40,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 +84,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,11 +95,11 @@ 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() {
+       protected function get_column_info() {
                $columns = get_column_headers( $this->_screen );
                $hidden = get_hidden_columns( $this->_screen );
                $sortable = array();
@@ -98,7 +107,7 @@ class _WP_List_Table_Compat extends WP_List_Table {
                return array( $columns, $hidden, $sortable );
        }
 
-       function get_columns() {
+       public function get_columns() {
                return $this->_columns;
        }
 }