golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@16688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-02 13:54:56 +00:00
parent 85c0930679
commit c6027947e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/post.php
View File

@ -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 );