Allow add_editor_style() to load a child theme's editor style when the parent theme's style exists for the same filename. props SergeyBiryukov. fixes #21026 for 3.4.

nacin · nacin · commit f77dddec8c10 · 2012-06-26T03:10:49.000Z
git-svn-id: https://develop.svn.wordpress.org/branches/3.4@21123 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
@@ -337,7 +337,6 @@ public static function editor_settings($editor_id, $set) {
 						foreach ( $editor_styles as $key => $file ) {
 							if ( $file && file_exists( "$template_dir/$file" ) ) {
 								$mce_css[] = "$template_uri/$file";
-								$editor_styles[$key] = '';
 							}
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,6 @@ public static function editor_settings($editor_id, $set) {`
`337`	`337`	`foreach ( $editor_styles as $key => $file ) {`
`338`	`338`	`if ( $file && file_exists( "$template_dir/$file" ) ) {`
`339`	`339`	`$mce_css[] = "$template_uri/$file";`
`340`		`- $editor_styles[$key] = '';`
`341`	`340`	`}`
`342`	`341`	`}`
`343`	`342`	`}`