Changeset 8772 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

08/09/2014 04:22:03 PM (10 years ago)

Author:

djpaul

Message:

Core: make sure we load minified JS and CSS when SCRIPT_DEBUG is set.

Fixes #5615

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (3 diffs)

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

@@ -203 +203 @@
 
         // Locate the BP stylesheet
-        $asset = $this->locate_asset_in_stack( 'buddypress.css', 'css' );
+        $asset = $this->locate_asset_in_stack( "buddypress{$min}.css", 'css' );
 
         // Enqueue BuddyPress-specific styling, if found
@@ -222 +222 @@
      */
     public function enqueue_scripts() {
-
-        $file = 'buddypress.js';
+        $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
         // Locate the BP JS file
-        $asset = $this->locate_asset_in_stack( $file, 'js' );
+        $asset = $this->locate_asset_in_stack( "buddypress{$min}.js", 'js' );
 
         // Enqueue the global JS, if found - AJAX will not work
@@ -260 +259 @@
         // Maybe enqueue password verify JS (register page or user settings page)
         if ( bp_is_register_page() || ( function_exists( 'bp_is_user_settings_general' ) && bp_is_user_settings_general() ) ) {
-            $min      = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-            $filename = "password-verify{$min}.js";
 
             // Locate the Register Page JS file
-            $asset = $this->locate_asset_in_stack( $filename, 'js' );
-
-            // Enqueue script
+            $asset = $this->locate_asset_in_stack( "password-verify{$min}.js", 'js' );
+
             $dependencies = array_merge( bp_core_get_js_dependencies(), array(
                 'password-strength-meter',
             ) );
+
+            // Enqueue script
             wp_enqueue_script( $asset['handle'] . '-password-verify', $asset['location'], $dependencies, $this->version);
         }