Changeset 8770 for trunk/src/bp-core/deprecated/2.1.php

Timestamp:

08/09/2014 02:55:29 PM (12 years ago)

Author:

djpaul

Message:

Core: load RTL stylesheets when we need to.

Fixes #5614

File:

• trunk/src/bp-core/deprecated/2.1.php (modified) (5 diffs)

trunk/src/bp-core/deprecated/2.1.php

@@ -43 +43 @@
  */
 function bp_core_register_deprecated_styles() {
-        $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.css' : '.min.css';
-        $rtl = is_rtl() ? '-rtl' : '';
+        $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         $url = buddypress()->plugin_url . 'bp-core/deprecated/css/';
 
@@ -50 +49 @@
                 // Messages
                 'bp-messages-autocomplete' => array(
-                        'file'         => "{$url}autocomplete/jquery.autocompletefb{$rtl}{$ext}",
+                        'file'         => "{$url}autocomplete/jquery.autocompletefb{$min}.css",
                         'dependencies' => array(),
                 )
@@ -57 +56 @@
         foreach ( $styles as $id => $style ) {
                 wp_register_style( $id, $style['file'], $style['dependencies'], bp_get_version() );
+
+                wp_style_add_data( $id, 'rtl', true );
+                if ( $min ) {
+                        wp_style_add_data( $id, 'suffix', $min );
+                }
         }
 }
@@ -345 +349 @@
  */
 function bp_core_load_buddybar_css() {
-        global $wp_styles;
-
         if ( bp_use_wp_admin_bar() || ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) || ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) )
                 return;
@@ -359 +361 @@
 
         wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array(), bp_get_version() );
-        $wp_styles->add_data( 'bp-admin-bar', 'rtl', true );
-        if ( $min )
-                $wp_styles->add_data( 'bp-admin-bar', 'suffix', $min );
+
+        wp_style_add_data( 'bp-admin-bar', 'rtl', true );
+        if ( $min ) {
+                wp_style_add_data( 'bp-admin-bar', 'suffix', $min );
+        }
 }
 add_action( 'bp_init', 'bp_core_load_buddybar_css' );