Changeset 26128

Timestamp:

11/13/2013 05:09:40 AM (10 years ago)

Author:

nacin

Message:

Fix new RTL file loading when style concatenation is enabled.

see #24977.

Location:

trunk/src

Files:

• wp-admin/load-styles.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/load-styles.php

@@ -118 +118 @@
     $path = ABSPATH . $style->src;
 
-    $content = get_file($path) . "\n";
+    if ( $rtl && ! empty( $style->extra['rtl'] ) ) {
+        // All default styles have fully independent RTL files.
+        $path = str_replace( '.min.css', '-rtl.min.css', $path );
+    }
 
-    if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) {
-        $rtl_path = is_bool($style->extra['rtl']) ? str_replace( '.min.css', '-rtl.min.css', $path ) : ABSPATH . $style->extra['rtl'];
-        $content .= get_file($rtl_path) . "\n";
-    }
+    $content = get_file( $path ) . "\n";
 
     if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {

trunk/src/wp-includes/script-loader.php

@@ -592 +592 @@
     foreach ( $rtl_styles as $rtl_style ) {
         $styles->add_data( $rtl_style, 'rtl', 'replace' );
+        if ( $suffix ) {
+            $styles->add_data( $rtl_style, 'suffix', $suffix );
+        }
     }
 }