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

Font Library: Avoid running init functions when font library is available in core. #58793

Merged
merged 6 commits into from
Feb 8, 2024
Merged

Font Library: Avoid running init functions when font library is available in core. #58793

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8118baf
add a conditional to initialize font library post types and rest rout…
matiasbenedetto Feb 7, 2024
3f03a82
remove comment no longer needed because the font library was already…
matiasbenedetto Feb 7, 2024
911eb85
fix conditional
matiasbenedetto Feb 7, 2024
938d740
format php
matiasbenedetto Feb 7, 2024
f96efa5
Merge branch 'trunk' into add/conditional-init-font-library
matiasbenedetto Feb 7, 2024
20693ca
update comment text
matiasbenedetto Feb 7, 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
10 changes: 7 additions & 3 deletions lib/compat/wordpress-6.5/fonts/fonts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ function gutenberg_create_initial_post_types() {
* @since 6.5
*/
function gutenberg_create_initial_rest_routes() {
// @core-merge: This code will go into Core's `create_initial_rest_routes()`.
$font_collections_controller = new WP_REST_Font_Collections_Controller();
$font_collections_controller->register_routes();
}
Expand All @@ -101,8 +100,13 @@ function gutenberg_create_initial_rest_routes() {
* @since 6.5
*/
function gutenberg_init_font_library() {
gutenberg_create_initial_post_types();
gutenberg_create_initial_rest_routes();
global $wp_version;

// Runs only if the Font Library is not available in core ( i.e. in core < 6.5-alpha ).
if ( version_compare( $wp_version, '6.5-alpha', '<' ) ) {
gutenberg_create_initial_post_types();
gutenberg_create_initial_rest_routes();
}
}

add_action( 'rest_api_init', 'gutenberg_init_font_library' );
Expand Down
Loading