From 571c7a69b8755c4a048bdbef9e2d5d9b90e82412 Mon Sep 17 00:00:00 2001 From: ramon Date: Tue, 9 Jul 2024 14:26:41 +1000 Subject: [PATCH] Rebase and move to 6.7 compat --- lib/compat/{wordpress-6.5 => wordpress-6.7}/formatting.php | 1 - lib/load.php | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) rename lib/compat/{wordpress-6.5 => wordpress-6.7}/formatting.php (99%) diff --git a/lib/compat/wordpress-6.5/formatting.php b/lib/compat/wordpress-6.7/formatting.php similarity index 99% rename from lib/compat/wordpress-6.5/formatting.php rename to lib/compat/wordpress-6.7/formatting.php index 36330bf275afcf..4ef4bdd44d98fb 100644 --- a/lib/compat/wordpress-6.5/formatting.php +++ b/lib/compat/wordpress-6.7/formatting.php @@ -6,7 +6,6 @@ * @package gutenberg */ - /** * Given a numeric value, returns a rounded a valid CSS as a string. * Negative zero values, e.g., `-0.0`, will return "0". diff --git a/lib/load.php b/lib/load.php index 774da3ef4140a4..89c122c38d1187 100644 --- a/lib/load.php +++ b/lib/load.php @@ -125,7 +125,6 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/compat/wordpress-6.5/blocks.php'; require __DIR__ . '/compat/wordpress-6.5/block-patterns.php'; require __DIR__ . '/compat/wordpress-6.5/kses.php'; -require __DIR__ . '/compat/wordpress-6.5/formatting.php'; require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php'; require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php'; require __DIR__ . '/compat/wordpress-6.5/interactivity-api/interactivity-api.php'; @@ -153,6 +152,9 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/compat/wordpress-6.6/option.php'; require __DIR__ . '/compat/wordpress-6.6/post.php'; +// WordPress 6.7 compat. +require __DIR__ . '/compat/wordpress-6.7/formatting.php'; + // Experimental features. require __DIR__ . '/experimental/block-editor-settings-mobile.php'; require __DIR__ . '/experimental/blocks.php';