Changeset 9629

Timestamp:

03/20/2015 01:01:18 PM (12 years ago)

Author:

djpaul

Message:

BP-Legacy: when loading RTL CSS, don't also load the LTR CSS.

Unlike WordPress, our RTL is a clone of the LTR file, instead of containing just the RTL adjustments.

wp_enqueue_style's RTL support works the WordPress way, not the BuddyPress way, so some of the logic has needed to be duplicated.
We maintain backwards compatibility with the style's existing script names in case existing sites have explicitly de-registered these styles already.

Fixes #6200

File:

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

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

@@ -207 +207 @@
 
                 // Locate the BP stylesheet
-                $asset = $this->locate_asset_in_stack( "buddypress{$min}.css", 'css' );
-
-                // Enqueue BuddyPress-specific styling, if found
-                if ( isset( $asset['location'], $asset['handle'] ) ) {
-                        wp_enqueue_style( $asset['handle'], $asset['location'], array(), $this->version, 'screen' );
-
-                        wp_style_add_data( $asset['handle'], 'rtl', true );
+                $ltr = $this->locate_asset_in_stack( "buddypress{$min}.css",     'css' );
+                $rtl = $this->locate_asset_in_stack( "buddypress-rtl{$min}.css", 'css' );
+
+                // LTR
+                if ( ! is_rtl() && isset( $ltr['location'], $ltr['handle'] ) ) {
+                        wp_enqueue_style( $ltr['handle'], $ltr['location'], array(), $this->version, 'screen' );
+
                         if ( $min ) {
-                                wp_style_add_data( $asset['handle'], 'suffix', $min );
+                                wp_style_add_data( $ltr['handle'], 'suffix', $min );
+                        }
+                }
+
+                // 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 ( $min ) {
+                                wp_style_add_data( $rtl['handle'], 'suffix', $min );
                         }
                 }