Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix blank site editor when theme name contains a period #37167

Merged
merged 7 commits into from
Dec 16, 2021
Merged

Fix blank site editor when theme name contains a period #37167

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8bf21a1
Add \. as valid character in rest route regex
mkaz Dec 6, 2021
311df5d
Fix regex for stylesheet vs. id
mkaz Dec 6, 2021
cdb6d9c
Add slash to regex to support subdir themes
mkaz Dec 7, 2021
6836963
Include subdir in regex
mkaz Dec 7, 2021
d6c6f4b
Update regex to match core trac update
mkaz Dec 8, 2021
b90d15b
Sync route regex for theme directory characters
mkaz Dec 15, 2021
6567fb5
Update global styles phpunit test from trac ticket.
mkaz Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions lib/compat/wordpress-5.9/class-gutenberg-rest-global-styles-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function register_routes() {
// List themes global styles.
register_rest_route(
$this->namespace,
'/' . $this->rest_base . '/themes/(?P<stylesheet>[^.\/]+(?:\/[^.\/]+)?)',
'/' . $this->rest_base . '/themes/(?P<stylesheet>[\/\s%\w\.\(\)\[\]\@_\-]+)',
array(
array(
'methods' => WP_REST_Server::READABLE,
Expand All @@ -46,7 +46,7 @@ public function register_routes() {
// 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(
'methods' => WP_REST_Server::READABLE,
Expand All @@ -56,6 +56,7 @@ public function register_routes() {
'id' => array(
'description' => __( 'The id of the global style variation', 'gutenberg' ),
'type' => 'string',
'sanitize_callback' => array( $this, '_sanitize_global_styles_callback' ),
),
),
),
Expand All @@ -70,6 +71,20 @@ public function register_routes() {
);
}

/**
* 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 );
}

/**
* Checks if the user has permissions to make the request.
*
Expand Down
5 changes: 4 additions & 1 deletion lib/compat/wordpress-5.9/class-gutenberg-rest-templates-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function register_routes() {
// Lists/updates a single template 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(
'methods' => WP_REST_Server::READABLE,
Expand Down Expand Up @@ -131,7 +131,10 @@ protected function permissions_check() {
* @return string Sanitized template ID.
*/
public function _sanitize_template_id( $id ) {
// Decode empty space.
$last_slash_pos = strrpos( $id, '/' );
$id = urldecode( $id );

if ( false === $last_slash_pos ) {
return $id;
}
Expand Down