Skip to content

Preload: fix multiple regressions around global styles #66468

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

Merged
ellatrix merged 10 commits into from
Oct 28, 2024
Merged

Preload: fix multiple regressions around global styles #66468

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec6ad3f
Preload: fix global styles regression
ellatrix Oct 25, 2024
ece965d
fix whitespace
ellatrix Oct 25, 2024
e6f8b5f
Fix notic
ellatrix Oct 25, 2024
12efb60
PHP lint
ellatrix Oct 25, 2024
167c596
Fix the other request too
ellatrix Oct 25, 2024
2ae7a9c
Fix whitespace again
ellatrix Oct 25, 2024
f4d9985
Fix unnecessary requests
ellatrix Oct 25, 2024
2da07af
Also preload variations
ellatrix Oct 25, 2024
659305b
Avoid early return and let isReady be set
ellatrix Oct 28, 2024
a9d2ec1
Add backport
ellatrix Oct 28, 2024
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
Prev Previous commit
Next Next commit
Fix the other request too
  • Loading branch information
@ellatrix
ellatrix committed Oct 25, 2024
commit 167c59645d29395d09110e7a0321f847c5e9b728
18 changes: 11 additions & 7 deletions lib/compat/wordpress-6.8/preload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
* @return array Filtered preload paths.
*/
function gutenberg_block_editor_preload_paths_6_8( $paths, $context ) {
$excluded_paths = array();
if ( 'core/edit-site' === $context->name || 'core/edit-post' === $context->name ) {
$stylesheet = get_stylesheet();
$global_styles_path = '/wp/v2/global-styles/themes/' . $stylesheet;
$paths[] = $global_styles_path . '?context=view';
foreach ( $paths as $key => $path ) {
if ( $path === $global_styles_path ) {
unset( $paths[ $key ] );
}
$stylesheet = get_stylesheet();
$global_styles_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
$paths[] = '/wp/v2/global-styles/themes/' . $stylesheet . '?context=view';
$paths[] = '/wp/v2/global-styles/' . $global_styles_id . '?context=view';
$excluded_paths[] = '/wp/v2/global-styles/themes/' . $stylesheet;
$excluded_paths[] = '/wp/v2/global-styles/' . $global_styles_id;
}
foreach ( $paths as $key => $path ) {
if ( in_array( $path, $excluded_paths, true ) ) {
unset( $paths[ $key ] );
}
}
return $paths;
Expand Down