From 51ddf2ca9cc111279af93434f138ebf31cb53d0c Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Thu, 1 Oct 2015 04:01:48 +0000
Subject: [PATCH] Correct some `WP_Query` metadata lazyloading docs.

Props dlh.
Fixes #34047.
Built from https://develop.svn.wordpress.org/trunk@34732


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

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 1d369d9ff8..130be3073e 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -4768,7 +4768,7 @@ class WP_Query {
 	 * @since 4.4.0
 	 * @access public
 	 *
-	 * @param null $check   The `$check` param passed from the 'pre_term_metadata' hook.
+	 * @param mixed $check  The `$check` param passed from the 'get_term_metadata' hook.
 	 * @param int  $term_id ID of the term whose metadata is being cached.
 	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
 	 *               another value if filtered by a plugin.
@@ -4776,7 +4776,7 @@ class WP_Query {
 	public function lazyload_term_meta( $check, $term_id ) {
 		/*
 		 * We only do this once per `WP_Query` instance.
-		 * Can't use `remove_action()` because of non-unique object hashes.
+		 * Can't use `remove_filter()` because of non-unique object hashes.
 		 */
 		if ( $this->updated_term_meta_cache ) {
 			return $check;
@@ -4839,14 +4839,14 @@ class WP_Query {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param null $check      The `$check` param passed from the 'pre_comment_metadata' hook.
+	 * @param mixed $check     The `$check` param passed from the 'get_comment_metadata' hook.
 	 * @param int  $comment_id ID of the comment whose metadata is being cached.
-	 * @return null In order not to short-circuit `get_metadata()`.
+	 * @return mixed The original value of `$check`, to not affect 'get_comment_metadata'.
 	 */
 	public function lazyload_comment_meta( $check, $comment_id ) {
 		/*
 		 * We only do this once per `WP_Query` instance.
-		 * Can't use `remove_action()` because of non-unique object hashes.
+		 * Can't use `remove_filter()` because of non-unique object hashes.
 		 */
 		if ( $this->updated_comment_meta_cache ) {
 			return $check;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6f0711eea0..d3ebf11636 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34731';
+$wp_version = '4.4-alpha-34732';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.