Changeset 12944

Timestamp:

05/09/2021 04:45:15 PM (4 years ago)

Author:

imath

Message:

BP Blocks: anticipate 2 deprecated WP 5.8 Block filters

In WordPress 5.8, the block_categories filter is deprecated in favor of the block_categories_all one and the block_editor_settings filter is deprecated in favor of block_editor_settings_all. To maintain backward compatibility with previous versions of WordPress, we are now checking if two functions introduced in WP 5.8 (get_default_block_categories() & get_block_editor_settings()) exists before using the right filters.

Fixes #8465

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-functions.php (modified) (1 diff)
• bp-core-blocks.php (modified) (1 diff)

trunk/src/bp-core/admin/bp-core-admin-functions.php

@@ -1345 +1345 @@
     );
 }
-add_filter( 'block_categories', 'bp_block_category', 1, 2 );
+
+/**
+ * Select the right `block_categories` filter according to WP version.
+ *
+ * @since 8.0.0
+ */
+function bp_block_init_category_filter() {
+    if ( function_exists( 'get_default_block_categories' ) ) {
+        add_filter( 'block_categories_all', 'bp_block_category', 1, 2 );
+    } else {
+        add_filter( 'block_categories', 'bp_block_category', 1, 2 );
+    }
+}
+add_action( 'bp_init', 'bp_block_init_category_filter' );

trunk/src/bp-core/bp-core-blocks.php

@@ -68 +68 @@
     return $editor_settings;
 }
-add_filter( 'block_editor_settings', 'bp_blocks_editor_settings' );
+
+/**
+ * Select the right `block_editor_settings` filter according to WP version.
+ *
+ * @since 8.0.0
+ */
+function bp_block_init_editor_settings_filter() {
+    if ( function_exists( 'get_block_editor_settings' ) ) {
+        add_filter( 'block_editor_settings_all', 'bp_blocks_editor_settings' );
+    } else {
+        add_filter( 'block_editor_settings', 'bp_blocks_editor_settings' );
+    }
+}
+add_action( 'bp_init', 'bp_block_init_editor_settings_filter' );
 
 /**