Remove changes that sneaked in during the rebase

WordPress · Jan 24, 2024 · a69d979 · a69d979
1 parent 1bfb830
commit a69d979
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php b/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
@@ -9,23 +9,8 @@
 		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
 			return null;
 		}
-		$block_id           = $block_instance->attributes['metadata']['id'];
-		$attribute_override = _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
-		if ( null === $attribute_override ) {
-			return null;
-		}
-		switch ( $attribute_override[0] ) {
-			case 0: // remove
-				/**
-				 * TODO: This currently doesn't remove the attribute, but only set it to an empty string.
-				 * It's a temporary solution until the block binding API supports different operations.
-				 */
-				return '';
-			case 1: // replace
-				return $attribute_override[1];
-			default:
-				return null;
-		}
+		$block_id = $block_instance->attributes['metadata']['id'];
+		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
 	};
 	wp_block_bindings_register_source(
 		'pattern_attributes',

diff --git a/lib/load.php b/lib/load.php
@@ -106,9 +106,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 // WordPress 6.5 compat.
 require __DIR__ . '/compat/wordpress-6.5/blocks.php';
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
+require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
-require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php';
-require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php';
 require __DIR__ . '/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php';
 require __DIR__ . '/compat/wordpress-6.5/block-bindings/block-bindings.php';
 require __DIR__ . '/compat/wordpress-6.5/block-bindings/sources/post-meta.php';
@@ -121,7 +120,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/kses.php';
 require __DIR__ . '/experimental/l10n.php';
 require __DIR__ . '/experimental/synchronization.php';
-require __DIR__ . '/experimental/script-modules.php';
 
 if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
@@ -140,13 +138,16 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/interactivity-api/directives/wp-text.php';
 require __DIR__ . '/experimental/interactivity-api/directives/wp-interactive.php';
 
+require __DIR__ . '/experimental/modules/class-gutenberg-modules.php';
+
 // Fonts API / Font Face.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
 
 // Loads the Font Library.
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';