Changeset 33891 for trunk/src/wp-includes/query.php

Timestamp:

09/03/2015 06:16:35 PM (9 years ago)

Author:

wonderboymusic

Message:

Introduce WP_Comment class to model/strongly-type rows from the comments database table. Inclusion of this class is a pre-req for some more general comment cleanup and sanity.

• Takes inspiration from WP_Post and adds sanity to comment caching.
• Clarifies when the current global value for $comment is returned. The current implementation in get_comment() introduces side effects and an occasion stale global value for $comment when comment caches are cleaned.
• Strongly-types @param docs
• This class is marked final for now

Props wonderboymusic, nacin.

See #32619.

File:

• trunk/src/wp-includes/query.php (modified) (3 diffs)

trunk/src/wp-includes/query.php

@@ -3187 +3187 @@
             $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
 
-            $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
+            $comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
+            // Convert to WP_Comment
+            $this->comments = array_map( 'get_comment', $comments );
             $this->comment_count = count($this->comments);
 
@@ -3558 +3560 @@
 
             $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits";
-            $this->comments = $wpdb->get_results($comments_request);
+            $comments = $wpdb->get_results($comments_request);
+            // Convert to WP_Comment
+            $this->comments = array_map( 'get_comment', $comments );
             $this->comment_count = count($this->comments);
         }
@@ -3813 +3817 @@
 
     /**
-     * Iterate current comment index and return comment object.
+     * Iterate current comment index and return WP_Comment object.
      *
      * @since 2.2.0
      * @access public
      *
-     * @return object Comment object.
+     * @return WP_Comment Comment object.
      */
     public function next_comment() {