From 5efc557eb8e7306f1aaae0a7abbb1fab12121626 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 29 Apr 2016 15:47:27 +0000
Subject: [PATCH] Comments: pass `$comment` to `comment_text()` in
 `Walker_Comment::comment()` instead of using a function which can skip the
 cache.

Props rachelbaker.
Fixes #35433.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-walker-comment.php | 2 +-
 wp-includes/version.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php
index 3065744e50..72220aaf0c 100644
--- a/wp-includes/class-walker-comment.php
+++ b/wp-includes/class-walker-comment.php
@@ -287,7 +287,7 @@ class Walker_Comment extends Walker {
 			?>
 		</div>
 
-		<?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+		<?php comment_text( $comment, array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
 
 		<?php
 		comment_reply_link( array_merge( $args, array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 84d96c8af4..5c9dcec5be 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37324';
+$wp_version = '4.6-alpha-37325';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.