Changeset 12949 for trunk/src/bp-activity/bp-activity-cssjs.php

Timestamp:

05/13/2021 05:26:01 PM (5 years ago)

Author:

imath

Message:

Anticipate the potential arrival of the Widgets Block Editor in WP 5.8

• Make sure the get_current_screen() is available before using it when loading BP Mentions JS & CSS.
• Make sure the BP Nouveau Activity Widget's activity type setting is fully unserialized.

Fixes #8476

File:

• trunk/src/bp-activity/bp-activity-cssjs.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-cssjs.php

@@ -23 +23 @@
     // Special handling for New/Edit screens in wp-admin.
     if ( is_admin() ) {
+        $current_screen = null;
+        if ( function_exists( 'get_current_screen' ) ) {
+            $current_screen = get_current_screen();
+        }
+
         if (
-            ! get_current_screen() ||
-            ! in_array( get_current_screen()->base, array( 'page', 'post' ) ) ||
-            ! post_type_supports( get_current_screen()->post_type, 'editor' ) ) {
+            ! $current_screen ||
+            ( isset( $current_screen->is_block_editor ) && $current_screen->is_block_editor ) ||
+            ! in_array( $current_screen->base, array( 'page', 'post' ) ) ||
+            ! post_type_supports( $current_screen->post_type, 'editor' ) ) {
             return;
         }