Changeset 16688

Timestamp:

12/02/2010 01:54:56 PM (16 years ago)

Author:

nacin

Message:

add_editor_style should include the parent theme CSS before the child theme CSS for override reasons. props JohnPBloch. fixes #14430.

File:

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

trunk/wp-admin/includes/post.php

@@ -1546 +1546 @@
                 $mce_css = array();
                 $style_uri = get_stylesheet_directory_uri();
-                if ( TEMPLATEPATH == STYLESHEETPATH ) {
+                if ( ! is_child_theme() ) {
                         foreach ( $editor_styles as $file )
                                 $mce_css[] = "$style_uri/$file";
@@ -1554 +1554 @@
                         $template_dir = get_template_directory();
                         foreach ( $editor_styles as $file ) {
+                                if ( file_exists( "$template_dir/$file" ) )
+                                        $mce_css[] = "$template_uri/$file";
                                 if ( file_exists( "$style_dir/$file" ) )
                                         $mce_css[] = "$style_uri/$file";
-                                if ( file_exists( "$template_dir/$file" ) )
-                                        $mce_css[] = "$template_uri/$file";
                         }
                 }