Ticket #15457: my-patch.diff

wp-admin/includes/post.php

@@ -1490 +1490 @@
 
         if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
                 $mce_css = array();
-                $style_uri = get_stylesheet_directory_uri();
-                if ( TEMPLATEPATH == STYLESHEETPATH ) {
-                        foreach ( $editor_styles as $file )
-                                $mce_css[] = "$style_uri/$file";
-                } else {
-                        $style_dir    = get_stylesheet_directory();
-                        $template_uri = get_template_directory_uri();
-                        $template_dir = get_template_directory();
-                        foreach ( $editor_styles as $file ) {
-                                if ( file_exists( "$style_dir/$file" ) )
+                foreach ( $editor_styles as $file ) {
+                        if ( strpos ( $file, 'http://' ) === 0 || strpos ( $file, 'https://' ) === 0 ) {
+                                $mce_css[] = $file;
+                        } else {
+                                $style_uri = get_stylesheet_directory_uri();
+                                if ( TEMPLATEPATH == STYLESHEETPATH ) {
                                         $mce_css[] = "$style_uri/$file";
-                                if ( file_exists( "$template_dir/$file" ) )
-                                        $mce_css[] = "$template_uri/$file";
+                                } else {
+                                        $style_dir    = get_stylesheet_directory();
+                                        $template_uri = get_template_directory_uri();
+                                        $template_dir = get_template_directory();
+                                        if ( file_exists( "$style_dir/$file" ) )
+                                                $mce_css[] = "$style_uri/$file";
+                                        if ( file_exists( "$template_dir/$file" ) )
+                                                $mce_css[] = "$template_uri/$file";
+                                }
                         }
                 }
                 $mce_css = implode( ',', $mce_css );