Fix PHP warning in WP_REST_Global_Styles_Controller if no styles exist in theme.json
#2224
Conversation
…exist in theme.json
| @@ -563,7 +563,8 @@ public function get_theme_item( $request ) { | |||
| } | |||
|
|
|||
| if ( rest_is_field_included( 'styles', $fields ) ) { | |||
| $data['styles'] = $theme->get_raw_data()['styles']; | |||
| $raw_data = $theme->get_raw_data(); | |||
| $data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array(); | |||
There was a problem hiding this comment.
I thought a little bit more about this and I think ideally if there are no styles we should just not include the styles in the rest response.
$raw_data = $theme->get_raw_data();
if( isset( $raw_data['styles'] ) ) {
$data['styles'] = $raw_data['styles'];
}
We avoid sending unnecessary bytes over the wire and we are more consistent with what is defined in theme.json. In that case, theme.json is not defining anything for styles if theme.json defines styles: {} in that case we send the empty array.
We should just make sure the Javascript code is not crashing if styles are omitted.
There was a problem hiding this comment.
In all my testing, there was no crash if styles weren't set. I could use some testing though from you @jorgefilipecosta or André that you've worked so much on these parts.
There was a problem hiding this comment.
Thank you for updating your PR and testing it 👍 I will just do a final checkup and if everything seems ok commit the patch.
493bdc8 to
3c4c4df
Compare
3c4c4df to
6431c43
Compare
Trac ticket: https://core.trac.wordpress.org/ticket/54900
During this GB PR I noticed a PHP warning in WP_REST_Global_Styles_Controller where we are assuming that every theme.json has styles property, which is not always the case.
It's fixed in GB now, but we should add this to 5.9 next minor release.
This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.