X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..c55863f11e8589bf8d4a5698bf15752406654f1c:/wp-admin/load-styles.php

diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index be781e29..d2f8bfbd 100644
--- 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();
@@ -121,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');