Changeset 13016

Timestamp:

07/15/2021 03:34:22 PM (4 years ago)

Author:

imath

Message:

Nouveau: only unregister the 'bp/primary-nav' block if it's registered

Nouveau unregisters this block when an admin edits a post type as it doesn't make sense to use this block into the Post Block Editor context. To prevent a _doing_it_wrong() from WordPress, it's probably safest to check if the block exists before unregistering it.

This commits also makes sure the user is using WP > 5.0.

Fixes #8528

File:

• trunk/src/bp-templates/bp-nouveau/includes/functions.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -1553 +1553 @@
  */
 function bp_nouveau_unregister_blocks_for_post_context() {
-    unregister_block_type( 'bp/primary-nav' );
+    if ( ! function_exists( 'unregister_block_type' ) ) {
+        return;
+    }
+
+    $is_registered = WP_Block_Type_Registry::get_instance()->is_registered( 'bp/primary-nav' );
+
+    if ( $is_registered ) {
+        unregister_block_type( 'bp/primary-nav' );
+    }
 }
 add_action( 'load-post.php', 'bp_nouveau_unregister_blocks_for_post_context' );