Ticket #7087: 7087.01.patch

src/bp-friends/classes/class-bp-core-friends-widget.php

@@ -30 +30 @@
                 );
                 parent::__construct( false, $name = _x( '(BuddyPress) Friends', 'widget name', 'buddypress' ), $widget_ops );
 
-                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) && ! is_admin() && ! is_network_admin() ) {
-                        $min = bp_core_get_minified_asset_suffix();
-                        wp_enqueue_script( 'bp_core_widget_friends-js', buddypress()->plugin_url . "bp-friends/js/widget-friends{$min}.js", array( 'jquery' ), bp_get_version() );
+                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
                 }
+        }
 
+        /**
+         * Enqueue scripts.
+         *
+         * @since 2.6.0
+         */
+        public function enqueue_scripts() {
+                $min = bp_core_get_minified_asset_suffix();
+                wp_enqueue_script( 'bp_core_widget_friends-js', buddypress()->plugin_url . "bp-friends/js/widget-friends{$min}.js", array( 'jquery' ), bp_get_version() );
         }
 
         /**

src/bp-groups/classes/class-bp-groups-widget.php

@@ -30 +30 @@
                 );
                 parent::__construct( false, _x( '(BuddyPress) Groups', 'widget name', 'buddypress' ), $widget_ops );
 
-                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) && ! is_admin() && ! is_network_admin() ) {
-                        $min = bp_core_get_minified_asset_suffix();
-                        wp_enqueue_script( 'groups_widget_groups_list-js', buddypress()->plugin_url . "bp-groups/js/widget-groups{$min}.js", array( 'jquery' ), bp_get_version() );
+                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
                 }
         }
 
         /**
+         * Enqueue scripts.
+         *
+         * @since 2.6.0
+         */
+        public function enqueue_scripts() {
+                $min = bp_core_get_minified_asset_suffix();
+                wp_enqueue_script( 'groups_widget_groups_list-js', buddypress()->plugin_url . "bp-groups/js/widget-groups{$min}.js", array( 'jquery' ), bp_get_version() );
+        }
+
+        /**
          * Extends our frontend output method.
          *
          * @since 1.0.3

src/bp-members/classes/class-bp-core-members-widget.php

@@ -35 +35 @@
                         'customize_selective_refresh' => true,
                 ) );
 
-                // Maybe enqueue JS for widget.
-                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) && ! is_admin() && ! is_network_admin() ) {
-                        wp_enqueue_script( 'bp-widget-members' );
+                if ( is_customize_preview() || is_active_widget( false, false, $this->id_base ) ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
                 }
         }
 
         /**
+         * Enqueue scripts.
+         *
+         * @since 2.6.0
+         */
+        public function enqueue_scripts() {
+                wp_enqueue_script( 'bp-widget-members' );
+        }
+
+        /**
          * Display the Members widget.
          *
          * @since 1.0.3