Changeset 9630

Timestamp:

03/20/2015 01:42:23 PM (10 years ago)

Author:

djpaul

Message:

BP-Legacy: load minified CSS/JS in all builds except src.

Problem was introduced in r9092 which was an attempt to not load minified assets for the src build.
This had the unfortunate consequence of not loading the minified assets, anywhere.

Fixes #6213

File:

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

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

@@ -318 +318 @@
      */
     private function locate_asset_in_stack( $file, $type = 'css', $script_handle = '' ) {
-        // Child, parent, theme compat
         $locations = array();
+
+        // Ensure the assets can be located when running from /src/.
+        if ( defined( 'BP_SOURCE_SUBDIRECTORY' ) && BP_SOURCE_SUBDIRECTORY === 'src' ) {
+            $file = str_replace( '.min', '', $file );
+        }
 
         // No need to check child if template == stylesheet
@@ -326 +330 @@
                 'dir'  => get_stylesheet_directory(),
                 'uri'  => get_stylesheet_directory_uri(),
-                'file' => str_replace( '.min', '', $file )
+                'file' => $file,
             );
         }
@@ -333 +337 @@
             'dir'  => get_template_directory(),
             'uri'  => get_template_directory_uri(),
-            'file' => str_replace( '.min', '', $file )
+            'file' => $file,
         );
 
@@ -339 +343 @@
             'dir'  => bp_get_theme_compat_dir(),
             'uri'  => bp_get_theme_compat_url(),
-            'file' => str_replace( '.min', '', $file )
+            'file' => $file,
         );