Changeset 20059

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

Location:

trunk/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• theme.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 {

trunk/wp-includes/theme.php

@@ -1335 +1335 @@
  * It is optional and defaults to 'editor-style.css'.
  *
- * Supports RTL stylesheets automatically by searching for the -rtl prefix, e.g.
- * editor-style-rtl.css. If an array of stylesheets is passed to add_editor_style(),
+ * This function automatically adds another stylesheet with -rtl prefix, e.g. editor-style-rtl.css.
+ * If that file doesn't exist, it is removed before adding the stylesheet(s) to TinyMCE.
+ * If an array of stylesheets is passed to add_editor_style(),
  * RTL is only added for the first stylesheet.
+ *
+ * Since version 3.4 the TinyMCE body has .rtl CSS class.
+ * It is a better option to use that class and add any RTL styles to the main stylesheet.
  *
  * @since 3.0.0