From 7ba8aa2bb4ebfc5e4242bff35929d931bb44e6bc Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 21 Aug 2020 21:34:03 +0000 Subject: [PATCH] Code Modernization: Fix PHP 8 "argument must be passed by reference, value given" error in `WP_Comment_Query::get_comments()`. The WP native `get_comment()` function expects the first argument `$comment` to be passed by reference. The PHP `array_map()` function, however, passes by value, not by reference, resulting in an "arguments must be passed by reference, value given" error. The PHP native `array_walk()` function does pass by reference. Using this prevents the error on PHP 8 and maintains the existing behaviour on PHP < 8. Props jrf. See #50913. Built from https://develop.svn.wordpress.org/trunk@48838 git-svn-id: http://core.svn.wordpress.org/trunk@48600 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-comment-query.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-wp-comment-query.php b/wp-includes/class-wp-comment-query.php index bbc6fe2d66..e185ceb40e 100644 --- a/wp-includes/class-wp-comment-query.php +++ b/wp-includes/class-wp-comment-query.php @@ -481,7 +481,8 @@ class WP_Comment_Query { $_comments = apply_filters_ref_array( 'the_comments', array( $_comments, &$this ) ); // Convert to WP_Comment instances. - $comments = array_map( 'get_comment', $_comments ); + array_walk( $_comments, 'get_comment' ); + $comments = $_comments; if ( $this->query_vars['hierarchical'] ) { $comments = $this->fill_descendants( $comments ); diff --git a/wp-includes/version.php b/wp-includes/version.php index fb4dade518..b2da042c2a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-48837'; +$wp_version = '5.6-alpha-48838'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.