WordPress 3.7.2-scripts

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

diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index 1e10c47a94ebca0af86c6527a8c1d7989e433d75..d2f8bfbdee4e4e0eb17e02f6be20bb3df5903762 100644 (file)
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -16,17 +16,11 @@ define( 'WPINC', 'wp-includes' );
  */
 function __() {}
 
-/**
- * @ignore
- */
-function _c() {}
-
 /**
  * @ignore
  */
 function _x() {}
 
-
 /**
  * @ignore
  */
@@ -102,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;
@@ -110,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();
@@ -126,11 +120,16 @@ foreach( $load as $handle ) {
        $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'];
+               $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";
        }
 
-       $out .= str_replace( '../images/', 'images/', $content );
+       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 );
+       } else {
+               $out .= str_replace( '../images/', 'images/', $content );
+       }
 }
 
 header('Content-Type: text/css');
@@ -139,10 +138,10 @@ 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 );
        }