WordPress 3.9

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

diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index e9673e26b0e4738ba5ff80aea3b2e9926e8a02bd..64ae474199d13d02b21357ba197137074850ccc9 100644 (file)
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -21,7 +21,6 @@ function __() {}
  */
 function _x() {}
 
-
 /**
  * @ignore
  */
@@ -97,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;
@@ -105,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();
@@ -118,26 +117,33 @@ 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 );
        }
 
-       $out .= str_replace( '../images/', 'images/', $content );
+       $content = get_file( $path ) . "\n";
+
+       if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {
+               $content = str_replace( '../images/', '../wp-includes/images/', $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 );
+       }
 }
 
-header('Content-Type: text/css');
+header('Content-Type: text/css; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
 if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
        header('Vary: Accept-Encoding'); // Handle proxies
-       if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+       if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
                header('Content-Encoding: deflate');
                $out = gzdeflate( $out, 3 );
-       } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+       } elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
                header('Content-Encoding: gzip');
                $out = gzencode( $out, 3 );
        }