Rest: Use utility function everywhere (#1461)

Author: obenland

includes/class-comment.php

@@ -717,7 +717,7 @@ public static function comment_query( $query ) {
 		}
 
 		// Do not exclude likes and reposts on REST requests.
-		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+		if ( \wp_is_serving_rest_request() ) {
 			return;
 		}
 

includes/collection/class-replies.php

@@ -78,7 +78,7 @@ public static function get_collection( $wp_object ) {
 		$id = self::get_id( $wp_object );
 
 		if ( is_wp_error( $id ) ) {
-			return defined( 'REST_REQUEST' ) && REST_REQUEST ? $id : null;
+			return \wp_is_serving_rest_request() ? $id : null;
 		}
 
 		$replies = array(
@@ -106,15 +106,15 @@ public static function get_collection_page( $wp_object, $page, $part_of = null )
 		// Build initial arguments for fetching approved comments.
 		$args = self::build_args( $wp_object );
 		if ( is_wp_error( $args ) ) {
-			return defined( 'REST_REQUEST' ) && REST_REQUEST ? $args : null;
+			return \wp_is_serving_rest_request() ? $args : null;
 		}
 
 		// Retrieve the partOf if not already given.
 		$part_of = $part_of ?? self::get_id( $wp_object );
 
 		// If the collection page does not exist.
 		if ( is_wp_error( $part_of ) ) {
-			return defined( 'REST_REQUEST' ) && REST_REQUEST ? $part_of : null;
+			return \wp_is_serving_rest_request() ? $part_of : null;
 		}
 
 		// Get to total replies count.