From 40725e9e67d10589b8314c5c623c38c66b64c162 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 12 Jul 2014 03:27:14 +0000 Subject: [PATCH] Repent for our original OOP sins and doc blocks as pertains to access modifiers in List Table + subclasses. Props SergeyBiryukov. See #28843 and [28583]. Built from https://develop.svn.wordpress.org/trunk@29118 git-svn-id: http://core.svn.wordpress.org/trunk@28904 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-links-list-table.php | 2 +- wp-admin/includes/class-wp-list-table.php | 8 ++++---- wp-admin/includes/class-wp-media-list-table.php | 2 +- wp-admin/includes/class-wp-ms-sites-list-table.php | 2 +- wp-admin/includes/class-wp-ms-themes-list-table.php | 2 +- wp-admin/includes/class-wp-ms-users-list-table.php | 2 +- wp-admin/includes/class-wp-plugin-install-list-table.php | 2 +- wp-admin/includes/class-wp-plugins-list-table.php | 2 +- wp-admin/includes/class-wp-posts-list-table.php | 2 +- wp-admin/includes/class-wp-terms-list-table.php | 2 +- wp-admin/includes/class-wp-themes-list-table.php | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php index 50e3136bd5..62768054bc 100644 --- a/wp-admin/includes/class-wp-links-list-table.php +++ b/wp-admin/includes/class-wp-links-list-table.php @@ -75,7 +75,7 @@ class WP_Links_List_Table extends WP_List_Table { '', 'name' => _x( 'Name', 'link name' ), diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index dcaeb23ce5..0d7bc65415 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -538,11 +538,11 @@ class WP_List_Table { * Get the current page number * * @since 3.1.0 - * @access protected + * @access public * * @return int */ - protected function get_pagenum() { + public function get_pagenum() { $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0; if( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) @@ -675,12 +675,12 @@ class WP_List_Table { * 'internal-name' => 'Title' * * @since 3.1.0 - * @access protected + * @access public * @abstract * * @return array */ - protected function get_columns() { + public function get_columns() { die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' ); } diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 2c9a96076f..c79e6afd13 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -170,7 +170,7 @@ class WP_Media_List_Table extends WP_List_Table { '; $posts_columns['icon'] = ''; diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 7e98b0f9eb..ae33a339a9 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -143,7 +143,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table { $this->view_switcher( $mode ); } - protected function get_columns() { + public function get_columns() { $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' ); $sites_columns = array( 'cb' => '', diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index 512e341d0f..038a62bf4a 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -174,7 +174,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table { _e( 'You do not appear to have any themes available at this time.' ); } - protected function get_columns() { + public function get_columns() { global $status; return array( diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index f458ed846c..55b274871a 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -108,7 +108,7 @@ class WP_MS_Users_List_Table extends WP_List_Table { $this->view_switcher( $mode ); } - protected function get_columns() { + public function get_columns() { $users_columns = array( 'cb' => '', 'username' => __( 'Username' ), diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index 7c1db5ecbc..48bddf1359 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -207,7 +207,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { return array( 'widefat', $this->_args['plural'] ); } - protected function get_columns() { + public function get_columns() { return array( 'name' => _x( 'Name', 'plugin name' ), 'version' => __( 'Version' ), diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 2d5e4979b0..cd1cd5c313 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -210,7 +210,7 @@ class WP_Plugins_List_Table extends WP_List_Table { _e( 'You do not appear to have any plugins available at this time.' ); } - protected function get_columns() { + public function get_columns() { global $status; return array( diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 5173daf32c..377b507ab1 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -264,7 +264,7 @@ class WP_Posts_List_Table extends WP_List_Table { return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' ); } - protected function get_columns() { + public function get_columns() { $post_type = $this->screen->post_type; $posts_columns = array(); diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php index 61ab9d6b8a..605b302f2e 100644 --- a/wp-admin/includes/class-wp-terms-list-table.php +++ b/wp-admin/includes/class-wp-terms-list-table.php @@ -116,7 +116,7 @@ class WP_Terms_List_Table extends WP_List_Table { return parent::current_action(); } - protected function get_columns() { + public function get_columns() { $columns = array( 'cb' => '', 'name' => _x( 'Name', 'term name' ), diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index 521d24b4d5..0e179802e1 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -110,7 +110,7 @@ class WP_Themes_List_Table extends WP_List_Table {