Ticket #8476: 8476.patch

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

@@ -22 +22 @@
 
         // 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;
                 }
         }

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

@@ -3 +3 @@
  * BP Nouveau Activity widgets
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -80 +80 @@
                  */
                 $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' ) ) );
 
                         // Add classes to the container
@@ -181 +185 @@
                 $type = array( 'activity_update' );
                 if ( ! empty( $instance['type'] ) ) {
                         $type = maybe_unserialize( $instance['type'] );
+                        if ( ! is_array( $type ) ) {
+                                $type = (array) maybe_unserialize( $type );
+                        }
                 }
                 ?>
                 <p>