From 5a65cd5dafc7892287bf1623a3b5d337641808a5 Mon Sep 17 00:00:00 2001 From: Anton Vlasenko Date: Thu, 14 Apr 2022 14:27:57 +0200 Subject: [PATCH] Don't implode slugs because .Org API supports arrays. --- src/wp-includes/block-patterns.php | 2 +- .../class-wp-rest-pattern-directory-controller.php | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index 0498db7e01f81..8b922e7dd1172 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -155,7 +155,7 @@ function _register_remote_theme_patterns() { } $request = new WP_REST_Request( 'GET', '/wp/v2/pattern-directory/patterns' ); - $request['slug'] = implode( ',', $pattern_settings ); + $request['slug'] = $pattern_settings; $response = rest_do_request( $request ); if ( $response->is_error() ) { return; diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php index 2deb3c7e7a387..28f42fd5a4938 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php @@ -25,8 +25,8 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller { * @since 5.8.0 */ public function __construct() { - $this->namespace = 'wp/v2'; - $this->rest_base = 'pattern-directory'; + $this->namespace = 'wp/v2'; + $this->rest_base = 'pattern-directory'; } /** @@ -137,11 +137,7 @@ public function get_items( $request ) { $raw_patterns = get_site_transient( $transient_key ); if ( ! $raw_patterns ) { - $api_url = add_query_arg( - array_map( 'rawurlencode', $query_args ), - 'http://api.wordpress.org/patterns/1.0/' - ); - + $api_url = 'http://api.wordpress.org/patterns/1.0/?' . build_query( $query_args ); if ( wp_http_supports( array( 'ssl' ) ) ) { $api_url = set_url_scheme( $api_url, 'https' ); }