From af593128a7349cff5579736e61cc931b01536889 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 16 Sep 2015 18:14:25 +0000
Subject: [PATCH] Revert [33925], by-reference array manipulation is breaking
 comments in some themes.

This implementation is losing its shine.

See #16894.

Built from https://develop.svn.wordpress.org/trunk@34245


git-svn-id: http://core.svn.wordpress.org/trunk@34209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 6 ------
 wp-includes/query.php            | 9 ---------
 wp-includes/version.php          | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 8490ac1082..016b515d78 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1815,12 +1815,6 @@ function wp_list_comments( $args = array(), $comments = null ) {
 		} else {
 			$_comments = $wp_query->comments;
 		}
-
-		if ( ! $wp_query->comment_meta_cached ) {
-			$comment_ids = wp_list_pluck( $_comments, 'comment_ID' );
-			update_meta_cache( 'comment', $comment_ids );
-			$wp_query->comment_meta_cached = true;
-		}
 	}
 
 	if ( '' === $r['per_page'] && get_option('page_comments') )
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 5648166e1b..7bcecf4ad5 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1292,15 +1292,6 @@ class WP_Query {
 	 */
 	 public $thumbnails_cached = false;
 
-	/**
-	 * Set if comment meta has already been cached
-	 *
-	 * @since 4.4.0
-	 * @access public
-	 * @var bool
-	 */
-	 public $comment_meta_cached = false;
-
 	/**
 	 * Cached list of search stopwords.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a4bd64dfa2..449646e1eb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34244';
+$wp_version = '4.4-alpha-34245';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.