Changeset 12949

Timestamp:

05/13/2021 05:26:01 PM (4 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

Location:

trunk/src

Files:

• bp-activity/bp-activity-cssjs.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/activity/widgets.php (modified) (3 diffs)

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;
         }

trunk/src/bp-templates/bp-nouveau/includes/activity/widgets.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
@@ -81 +81 @@
         $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-        // Check instance for custom max number of activities to display
+        // Check instance for custom max number of activities to display.
         if ( ! empty( $instance['max'] ) ) {
             $max = (int) $instance['max'];
         }
 
-        // Check instance for custom activity types
+        // Check instance for custom activity types.
         if ( ! empty( $instance['type'] ) ) {
-            $type    = maybe_unserialize( $instance['type'] );
+            $type = maybe_unserialize( $instance['type'] );
+            if ( ! is_array( $type ) ) {
+                $type = (array) maybe_unserialize( $type );
+            }
+
             $classes = array_map( 'sanitize_html_class', array_merge( $type, array( 'bp-latest-activities' ) ) );
 
@@ -182 +186 @@
         if ( ! empty( $instance['type'] ) ) {
             $type = maybe_unserialize( $instance['type'] );
+            if ( ! is_array( $type ) ) {
+                $type = (array) maybe_unserialize( $type );
+            }
         }
         ?>