Changeset 20342

Timestamp:

04/02/2012 10:26:11 PM (13 years ago)

Author:

azaozz

Message:

Fix adding of parent theme's editor-style before child theme's, props SergeyBiryukov, see #19437

File:

• trunk/wp-includes/class-wp-editor.php (modified) (1 diff)

trunk/wp-includes/class-wp-editor.php

@@ -331 +331 @@
                     $style_dir = get_stylesheet_directory();
 
-                    foreach ( $editor_styles as $key => $file ) {
-                        if ( $file && file_exists( "$style_dir/$file" ) ) {
-                            $mce_css[] = "$style_uri/$file";
-                            $editor_styles[$key] = '';
-                        }
-                    }
-
                     if ( is_child_theme() ) {
                         $template_uri = get_template_directory_uri();
                         $template_dir = get_template_directory();
 
-                        foreach ( $editor_styles as $file ) {
-                            if ( $file && file_exists( "$template_dir/$file" ) )
+                        foreach ( $editor_styles as $key => $file ) {
+                            if ( $file && file_exists( "$template_dir/$file" ) ) {
                                 $mce_css[] = "$template_uri/$file";
+                                $editor_styles[$key] = '';
+                            }
                         }
+                    }
+
+                    foreach ( $editor_styles as $file ) {
+                        if ( $file && file_exists( "$style_dir/$file" ) )
+                            $mce_css[] = "$style_uri/$file";
                     }