Changeset 9883

Timestamp:

05/20/2015 10:46:00 PM (11 years ago)

Author:

r-a-y

Message:

Follow-up to r9882.

See #6124.

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -232 +232 @@
 
                 // RTL
-                if ( is_rtl() && isset( $rtl['location'], $rtl['handle'] ) ) {
-                        $rtl['handle'] = str_replace( '-css', '-css-rtl', $rtl['handle'] );  // Backwards compatibility
-                        wp_enqueue_style( $rtl['handle'], $rtl['location'], array(), $this->version, 'screen' );
+                if ( is_rtl() ) {
+                        $rtl = $this->locate_asset_in_stack( "buddypress-rtl{$min}.css", 'css' );
+
+                        if ( isset( $rtl['location'], $rtl['handle'] ) ) {
+                                $rtl['handle'] = str_replace( '-css', '-css-rtl', $rtl['handle'] );  // Backwards compatibility
+                                wp_enqueue_style( $rtl['handle'], $rtl['location'], array(), $this->version, 'screen' );
+
+                                if ( $min ) {
+                                        wp_style_add_data( $rtl['handle'], 'suffix', $min );
+                                }
+                        }
+                }
+
+                // Compatibility stylesheets for specific themes.
+                $theme = $this->locate_asset_in_stack( get_template() . "{$min}.css", 'css' );
+                if ( ! is_rtl() && isset( $theme['location'] ) ) {
+                        // use a unique handle
+                        $theme['handle'] = 'bp-' . get_template();
+                        wp_enqueue_style( $theme['handle'], $theme['location'], array(), $this->version, 'screen' );
 
                         if ( $min ) {
-                                wp_style_add_data( $rtl['handle'], 'suffix', $min );
+                                wp_style_add_data( $theme['handle'], 'suffix', $min );
                         }
                 }
 
-                // Compatibility stylesheets for specific themes.
-                $asset = $this->locate_asset_in_stack( get_template() . "{$min}.css", 'css' );
-                if ( isset( $asset['location'] ) ) {
-                        // use a unique handle
-                        $asset['handle'] = 'bp-' . get_template();
-                        wp_enqueue_style( $asset['handle'], $asset['location'], array(), $this->version, 'screen' );
-
-                        if ( $min ) {
-                                wp_style_add_data( $asset['handle'], 'suffix', $min );
+                // Compatibility stylesheet for specific themes, RTL-version
+                if ( is_rtl() ) {
+                        $theme_rtl = $this->locate_asset_in_stack( get_template() . "-rtl{$min}.css", 'css' );
+
+                        if ( isset( $theme_rtl['location'] ) ) {
+                                $theme_rtl['handle'] = $theme['handle'] . '-rtl';
+                                wp_enqueue_style( $theme_rtl['handle'], $theme_rtl['location'], array(), $this->version, 'screen' );
+
+                                if ( $min ) {
+                                        wp_style_add_data( $theme_rtl['handle'], 'suffix', $min );
+                                }
                         }
                 }