Changeset 30984

Timestamp:

12/20/2014 11:27:00 PM (12 years ago)

Author:

wonderboymusic

Message:

Comment List Tables:

• Declare $extra_items property
• Since ->get_column_info() overrides its parent's method, it doesn't need to set _column_headers, which is an undeclared property that is only used for caching the lookup after the first run in the parent class, which isn't called in the child class.
• $_args in WP_List_Table has to be protected for WP_Post_Comments_List_Table to legally access it. $_args is awkward as is and should probably be only available via a getter.

See #30799.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-comments-list-table.php (modified) (5 diffs)
• class-wp-list-table.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -21 +21 @@
 
         public $pending_count = array();
+
+        public $extra_items;
 
         /**
@@ -380 +382 @@
                 $post = get_post();
 
-                $user_can = $this->user_can;
-
                 $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
                 $the_comment_status = wp_get_comment_status( $comment->comment_ID );
 
-                if ( $user_can ) {
+                if ( $this->user_can ) {
                         $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
                         $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
@@ -421 +421 @@
                 echo '</div>';
                 comment_text();
-                if ( $user_can ) { ?>
+                if ( $this->user_can ) { ?>
                 <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
                 <textarea class="comment" rows="1" cols="1"><?php
@@ -435 +435 @@
                 }
 
-                if ( $user_can ) {
+                if ( $this->user_can ) {
                         // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
                         $actions = array(
@@ -597 +597 @@
 
         protected function get_column_info() {
-                $this->_column_headers = array(
+                return array(
                         array(
-                        'author'   => __( 'Author' ),
-                        'comment'  => _x( 'Comment', 'column name' ),
+                                'author'   => __( 'Author' ),
+                                'comment'  => _x( 'Comment', 'column name' ),
                         ),
                         array(),
                         array(),
                 );
-
-                return $this->_column_headers;
         }
 

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -25 +25 @@
          * @since 3.1.0
          * @var array
-         * @access private
-         */
-        private $_args;
+         * @access protected
+         */
+        protected $_args;
 
         /**