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

Timestamp:

03/07/2018 02:44:19 PM (7 years ago)

Author:

djpaul

Message:

Templates, Legacy: fix minified assets not enqueued when in child theme.

Fixes #7694

Props pscolv

File:

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

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

@@ -383 +383 @@
         // No need to check child if template == stylesheet.
         if ( is_child_theme() ) {
-            $locations['bp-child'] = array(
+            $locations[] = array(
+                'type' => 'bp-child',
+                'dir'  => get_stylesheet_directory(),
+                'uri'  => get_stylesheet_directory_uri(),
+                'file' => $file,
+            );
+
+            $locations[] = array(
+                'type' => 'bp-child',
                 'dir'  => get_stylesheet_directory(),
                 'uri'  => get_stylesheet_directory_uri(),
@@ -390 +398 @@
         }
 
-        $locations['bp-parent'] = array(
+        $locations[] = array(
+            'type' => 'bp-parent',
             'dir'  => get_template_directory(),
             'uri'  => get_template_directory_uri(),
@@ -396 +405 @@
         );
 
-        $locations['bp-legacy'] = array(
+        $locations[] = array(
+            'type' => 'bp-legacy',
             'dir'  => bp_get_theme_compat_dir(),
             'uri'  => bp_get_theme_compat_url(),
@@ -411 +421 @@
         $retval = array();
 
-        foreach ( $locations as $location_type => $location ) {
+        foreach ( $locations as $location ) {
             foreach ( $subdirs as $subdir ) {
                 if ( file_exists( trailingslashit( $location['dir'] ) . trailingslashit( $subdir ) . $location['file'] ) ) {
                     $retval['location'] = trailingslashit( $location['uri'] ) . trailingslashit( $subdir ) . $location['file'];
-                    $retval['handle']   = ( $script_handle ) ? $script_handle : "{$location_type}-{$type}";
+                    $retval['handle']   = ( $script_handle ) ? $script_handle : "{$location['type']}-{$type}";
 
                     break 2;