Rebase and move to 6.7 compat

WordPress · Jul 9, 2024 · 571c7a6 · 571c7a6
1 parent 5df4061
commit 571c7a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/compat/wordpress-6.5/formatting.php → lib/compat/wordpress-6.7/formatting.php b/lib/compat/wordpress-6.5/formatting.php → lib/compat/wordpress-6.7/formatting.php
@@ -6,7 +6,6 @@
  * @package gutenberg
  */
 
-
 /**
  * Given a numeric value, returns a rounded a valid CSS <number> as a string.
  * Negative zero values, e.g., `-0.0`, will return "0".

diff --git 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';
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
      * @package gutenberg
      */
     /**
      * Given a numeric value, returns a rounded a valid CSS <number> as a string.
      * Negative zero values, e.g., `-0.0`, will return "0".
@@ Expand Down @@