Changeset 52376 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

Timestamp:

12/14/2021 06:22:07 PM (3 years ago)

Author:

hellofromTonya

Message:

REST API: Add block theme support for valid non-alphanumeric characters in theme's directory name.

Themes whose wp-content/themes/<dirname> include valid non-alphanumeric (cross-platform) characters work for non-block themes, but did not previously resolve for block themes. For example, a block theme in wp-content/themes/twentytwentytwo-0.4.0/ directory resulted a 404 "No route was found matching the URL and request method" response when attempting to customize it in the Site Editor.

This commit adds support for the following characters in a theme's root directory: _, ., @, [, ], (, and ). Subdirectory themes and - are already supported.

Follow-up to [51003], [52051], [52275].

Props mkaz, costdev, hellofromTonya, jffng, justinahinon, peterwilsoncc, spacedmonkey, TimothyBlynJacobs.
Fixes #54596.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (6 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -42 +42 @@
         register_rest_route(
             $this->namespace,
-            '/' . $this->rest_base . '/themes/(?P<stylesheet>[^.\/]+(?:\/[^.\/]+)?)',
+            '/' . $this->rest_base . '/themes/(?P<stylesheet>[\/\s%\w\.\(\)\[\]\@_\-]+)',
             array(
                 array(
@@ -50 +50 @@
                     'args'                => array(
                         'stylesheet' => array(
-                            'description' => __( 'The theme identifier' ),
-                            'type'        => 'string',
+                            'description'       => __( 'The theme identifier' ),
+                            'type'              => 'string',
+                            'sanitize_callback' => array( $this, '_sanitize_global_styles_callback' ),
                         ),
                     ),
@@ -58 +59 @@
         );
 
-        // Lists/updates a single gloval style variation based on the given id.
+        // Lists/updates a single global style variation based on the given id.
         register_rest_route(
             $this->namespace,
-            '/' . $this->rest_base . '/(?P<id>[\/\w-]+)',
+            '/' . $this->rest_base . '/(?P<id>[\/\s%\w\.\(\)\[\]\@_\-]+)',
             array(
                 array(
@@ -69 +70 @@
                     'args'                => array(
                         'id' => array(
-                            'description' => __( 'The id of a template' ),
-                            'type'        => 'string',
+                            'description'       => __( 'The id of a template' ),
+                            'type'              => 'string',
+                            'sanitize_callback' => array( $this, '_sanitize_global_styles_callback' ),
                         ),
                     ),
@@ -83 +85 @@
             )
         );
+    }
+
+    /**
+     * Sanitize the global styles ID or stylesheet to decode endpoint.
+     * For example, `wp/v2/global-styles/templatetwentytwo%200.4.0`
+     * would be decoded to `templatetwentytwo 0.4.0`.
+     *
+     * @since 5.9.0
+     *
+     * @param string $id_or_stylesheet Global styles ID or stylesheet.
+     * @return string Sanitized global styles ID or stylesheet.
+     */
+    public function _sanitize_global_styles_callback( $id_or_stylesheet ) {
+        return urldecode( $id_or_stylesheet );
     }
 
@@ -520 +536 @@
      *
      * @param WP_REST_Request $request The request instance.
-     *
      * @return WP_REST_Response|WP_Error
      */