From 4a8c7f3dfa2136ec7ef6737493eb99a82a85b3fc Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 2 Dec 2010 13:54:56 +0000 Subject: [PATCH] add_editor_style should include the parent theme CSS before the child theme CSS for override reasons. props JohnPBloch. fixes #14430. git-svn-id: https://develop.svn.wordpress.org/trunk@16688 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/post.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 37bf470d41..1fb464ffcb 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1545,7 +1545,7 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) { $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"; } else { @@ -1553,10 +1553,10 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { $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"; + if ( file_exists( "$style_dir/$file" ) ) + $mce_css[] = "$style_uri/$file"; } } $mce_css = implode( ',', $mce_css );