Changeset 13453 for trunk/wp-admin/includes/post.php

Timestamp:

02/27/2010 07:36:35 AM (14 years ago)

Author:

nacin

Message:

add_editor_style() third pass. better performance and better child theme support. see #11512

File:

• trunk/wp-admin/includes/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -1306 +1306 @@
  */
 function wp_tiny_mce( $teeny = false, $settings = false ) {
-    global $concatenate_scripts, $compress_scripts, $tinymce_version;
+    global $concatenate_scripts, $compress_scripts, $tinymce_version, $editor_styles;
 
     if ( ! user_can_richedit() )
@@ -1468 +1468 @@
     );
 
-    $mce_css = trim(apply_filters('mce_css', ''), ' ,');
+    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" ) )
+                    $mce_css[] = "$style_uri/$file";
+                if ( file_exists( "$template_dir/$file" ) )
+                    $mce_css[] = "$template_uri/$file";
+            }
+        }
+        $mce_css = implode( ',', $mce_css );
+    } else {
+        $mce_css = '';
+    }
+
+    $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
 
     if ( ! empty($mce_css) )