Ticket #4949: 4949-01.patch

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

@@ -195 +195 @@
         public function enqueue_styles() {
 
                 // LTR or RTL
-                $file = is_rtl() ? 'css/buddypress-rtl.css' : 'css/buddypress.css';
-
-                // Check child theme
-                if ( file_exists( trailingslashit( get_stylesheet_directory() ) . $file ) ) {
-                        $location = trailingslashit( get_stylesheet_directory_uri() );
-                        $handle   = 'bp-child-css';
-
-                // Check parent theme
-                } elseif ( file_exists( trailingslashit( get_template_directory() ) . $file ) ) {
-                        $location = trailingslashit( get_template_directory_uri() );
-                        $handle   = 'bp-parent-css';
-
-                // BuddyPress Theme Compatibility
+                $file_name = is_rtl() ? 'buddypress-rtl.css' : 'buddypress.css';
+                
+                // Check whether child theme or parent
+                $path = ( is_child_theme() )? trailingslashit( get_stylesheet_directory() ) : trailingslashit( get_template_directory() );
+                $path_uri = ( is_child_theme() )? trailingslashit( get_stylesheet_directory_uri() ) : trailingslashit( get_template_directory_uri() );
+                
+                // Check for 'buddypress/' in theme root
+                if ( file_exists( $path . 'buddypress/css/' . $file_name ) ) {
+                        $location = $path_uri . 'buddypress/css/';
+                        $handle = ( is_child_theme() )? 'bp-child-css' : 'bp-parent-css';
+                
+                // Check for 'community/' in theme root
+                } elseif ( file_exists( $path . 'community/css/' . $file_name ) ) {
+                        $location = $path_uri . 'community/css/';
+                        $handle = ( is_child_theme() )? 'bp-child-css' : 'bp-parent-css';
+                
+                // Check for 'css/' in theme root - in case themes already have this
+                } elseif ( file_exists( $path . 'css/' . $file_name ) ) {
+                        $location = $path_uri . 'css/';
+                        $handle = ( is_child_theme() )? 'bp-child-css' : 'bp-parent-css';
+                
+                // BuddyPress Theme Compatibility               
                 } else {
-                        $location = trailingslashit( $this->url );
+                        $location = trailingslashit( $this->url ) . 'css/';
                         $handle   = 'bp-legacy-css';
                 }
 
                 // Enqueue the BuddyPress styling
-                wp_enqueue_style( $handle, $location . $file, array(), $this->version, 'screen' );
+                wp_enqueue_style( $handle, $location . $file_name, array(), $this->version, 'screen' );
         }
 
         /**