WordPress 3.8.1

[autoinstalls/wordpress.git] / wp-admin / load-styles.php

diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index bdacc21ce364d2f0efb0ca664d6fcc16956368fc..75e655c4d4b6b7491bb235af305182699a67dda9 100644 (file)
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -96,7 +96,7 @@ require(ABSPATH . '/wp-includes/script-loader.php');
 require(ABSPATH . '/wp-includes/version.php');
 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
-$load = explode(',', $load);
+$load = array_unique( explode( ',', $load ) );
 
 if ( empty($load) )
        exit;
@@ -104,7 +104,7 @@ if ( empty($load) )
 $compress = ( isset($_GET['c']) && $_GET['c'] );
 $force_gzip = ( $compress && 'gzip' == $_GET['c'] );
 $rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
-$expires_offset = 31536000;
+$expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_styles = new WP_Styles();
@@ -117,16 +117,18 @@ foreach( $load as $handle ) {
        $style = $wp_styles->registered[$handle];
        $path = ABSPATH . $style->src;
 
-       $content = get_file($path) . "\n";
-
-       if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) {
-               $rtl_path = is_bool($style->extra['rtl']) ? str_replace( '.css', '-rtl.css', $path ) : ABSPATH . $style->extra['rtl'];
-               $content .= get_file($rtl_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 );
        }
 
+       $content = get_file( $path ) . "\n";
+
        if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {
                $content = str_replace( '../images/', '../wp-includes/images/', $content );
-               $out .= str_replace( '../js/tinymce/', '../wp-includes/js/tinymce/', $content );
+               $content = str_replace( '../js/tinymce/', '../wp-includes/js/tinymce/', $content );
+               $content = str_replace( '../fonts/', '../wp-includes/fonts/', $content );
+               $out .= $content;
        } else {
                $out .= str_replace( '../images/', 'images/', $content );
        }