Changeset 20059 for trunk/wp-includes/class-wp-editor.php

Timestamp:

03/01/2012 12:18:26 AM (14 years ago)

Author:

azaozz

Message:

Don't pass non-existing rtl stylesheet to TinyMCE, update phpdoc for add_editor_style(), see #19437

File:

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

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

@@ -329 +329 @@
                     $editor_styles = array_unique($editor_styles);
                     $style_uri = get_stylesheet_directory_uri();
-                    if ( ! is_child_theme() ) {
-                        foreach ( $editor_styles as $file )
+                    $style_dir = get_stylesheet_directory();
+
+                    foreach ( $editor_styles as $key => $file ) {
+                        if ( $file && file_exists( "$style_dir/$file" ) ) {
                             $mce_css[] = "$style_uri/$file";
-                    } else {
-                        $style_dir    = get_stylesheet_directory();
+                            $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_exists( "$template_dir/$file" ) )
+                            if ( $file && file_exists( "$template_dir/$file" ) )
                                 $mce_css[] = "$template_uri/$file";
                         }
-
-                        foreach ( $editor_styles as $file ) {
-                            if ( file_exists( "$style_dir/$file" ) )
-                                $mce_css[] = "$style_uri/$file";
-                        }
                     }
+
                     $mce_css = implode( ',', $mce_css );
                 } else {