Ticket #34047: 34047.3.diff

src/wp-includes/query.php

@@ -3561 +3561 @@
 
 
                 if ( $q['update_post_term_cache'] ) {
-                        add_action( 'get_term_metadata', array( $this, 'lazyload_term_meta' ), 10, 2 );
+                        add_filter( 'get_term_metadata', array( $this, 'lazyload_term_meta' ), 10, 2 );
                 }
 
                 if ( ! $q['suppress_filters'] ) {
@@ -3693 +3693 @@
 
                 // If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
                 if ( ! empty( $this->comments ) ) {
-                        add_action( 'get_comment_metadata', array( $this, 'lazyload_comment_meta' ), 10, 2 );
+                        add_filter( 'get_comment_metadata', array( $this, 'lazyload_comment_meta' ), 10, 2 );
                 }
 
                 if ( ! $q['suppress_filters'] ) {
@@ -4768 +4768 @@
          * @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 +4776 @@
         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 +4839 @@
          *
          * @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;