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

Fix fatal error by checking if block_type asset properties are set #46488

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Fix fatal error by checking if block_type asset properties are set #46488

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bed01bf
Check for NULL value in block_type asset handles
noahtallen Dec 13, 2022
04aff77
Use isset instead of is_null
noahtallen Dec 13, 2022
7fb4cf6
Use isset in if-statement instead of ternary
noahtallen Dec 13, 2022
789039a
Add comment
noahtallen Dec 13, 2022
3c61d28
Add is_array check
noahtallen Dec 14, 2022
fbc62c6
Don't block merging both if only one is unavailable
noahtallen Dec 14, 2022
5953ca3
Add variable assignment back
noahtallen Dec 14, 2022
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
22 changes: 12 additions & 10 deletions lib/compat/wordpress-6.2/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,18 @@ function gutenberg_resolve_assets_override() {
$block_registry = WP_Block_Type_Registry::get_instance();

foreach ( $block_registry->get_all_registered() as $block_type ) {
$style_handles = array_merge(
$style_handles,
$block_type->style_handles,
$block_type->editor_style_handles
);

$script_handles = array_merge(
$script_handles,
$block_type->script_handles
);
// In older WordPress versions, like 6.0, these properties are not defined.
if ( isset( $block_type->style_handles ) && is_array( $block_type->style_handles ) ) {
array_merge( $style_handles, $block_type->style_handles );
noahtallen marked this conversation as resolved.
Show resolved Hide resolved
}

if ( isset( $block_type->editor_style_handles ) && is_array( $block_type->editor_style_handles ) ) {
array_merge( $style_handles, $block_type->editor_style_handles );
}

if ( isset( $block_type->script_handles ) && is_array( $block_type->script_handles ) ) {
array_merge( $script_handles, $block_type->script_handles );
}
}

$style_handles = array_unique( $style_handles );
Expand Down