Wordpress 3.3-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..4adc3677fb6c6805bedc7db72ae2ac6047ddc3ec 100644 (file)
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -16,11 +16,6 @@ define( 'WPINC', 'wp-includes' );
  */
 function __() {}
 
-/**
- * @ignore
- */
-function _c() {}
-
 /**
  * @ignore
  */
@@ -130,7 +125,12 @@ foreach( $load as $handle ) {
                $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 +139,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 );
        }