Ticket #9304: 9304.01.patch

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -84 +84 @@
                 add_action( 'bp_enqueue_community_scripts', array( $this, 'enqueue_scripts'  ) ); // Enqueue theme JS
                 add_action( 'bp_enqueue_community_scripts', array( $this, 'localize_scripts' ) ); // Enqueue theme script localization
 
-                /** This filter is documented in bp-core/bp-core-dependency.php */
-                if ( is_buddypress() || ! apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
-                        // Body no-js class.
-                        add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
-                }
+                // Body no-js class.
+                add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
 
                 /** Buttons ***********************************************************/
 
@@ -480 +477 @@
          * @return array $classes
          */
         public function add_nojs_body_class( $classes ) {
+                /** This filter is documented in bp-core/bp-core-dependency.php */
+                if ( ! is_buddypress() || apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
+                        return $classes;
+                }
+
                 if ( ! in_array( 'no-js', $classes ) )
                         $classes[] = 'no-js';
 

src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -227 +227 @@
                 add_action( 'bp_enqueue_community_scripts', array( $this, 'localize_scripts' ) );
                 remove_action( 'bp_enqueue_community_scripts', 'bp_core_confirmation_js' );
 
-                /** This filter is documented in bp-core/bp-core-dependency.php */
-                if ( is_buddypress() || ! apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
-                        // Body no-js class.
-                        add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
-                }
+                // Body no-js class.
+                add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
 
                 // Ajax querystring.
                 add_filter( 'bp_ajax_querystring', 'bp_nouveau_ajax_querystring', 10, 2 );
@@ -488 +485 @@
          * @return array $classes
          */
         public function add_nojs_body_class( $classes ) {
+                /** This filter is documented in bp-core/bp-core-dependency.php */
+                if ( ! is_buddypress() || apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
+                        return $classes;
+                }
+
                 $classes[] = 'no-js';
                 return array_unique( $classes );
         }