Changeset 13444

Timestamp:

02/26/2010 09:07:41 PM (15 years ago)

Author:

nacin

Message:

add_editor_style(), second pass. Accept an array of stylesheets, also allow multiple calls to the function. Support child themes. See #9015 see #11512

File:

• trunk/wp-includes/theme.php (modified) (3 diffs)

trunk/wp-includes/theme.php

@@ -1448 +1448 @@
 
 /**
- * Add callback for a custom TinyMCE editor stylesheet.
+ * Add callback for custom TinyMCE editor stylesheets.
  *
  * The parameter $stylesheet is the name of the stylesheet, relative to
- * the theme root. It is optional and defaults to 'editor-style.css'.
+ * the theme root. It also accepts an array of stylesheets.
+ * It is optional and defaults to 'editor-style.css'.
  *
  * @since 3.0.0
  *
- * @param callback $stylesheet Name of stylesheet relative to theme root.
+ * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ *  Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
-    if ( isset( $GLOBALS['editor_style'] ) )
-        return;
 
     add_theme_support( 'editor-style' );
@@ -1466 +1466 @@
         return;
 
-    $GLOBALS['editor_style'] = $stylesheet;
+    global $editor_style;
+    $editor_style = (array) $editor_style;
+    $stylesheet   = (array) $stylesheet;
+    foreach ( $stylesheet as $file ) {
+        if ( file_exists( get_stylesheet_directory() . "/$file" )
+            && ( $uri = get_stylesheet_directory_uri() . "/$file" )
+            && ! in_array( $uri, $editor_style ) )
+            $editor_style[] = $uri;
+        elseif ( TEMPLATEPATH !== STYLESHEETPATH
+            && file_exists( get_template_directory() . "/$file" )
+            && ( $uri = get_template_directory_uri() . "/$file" )
+            && ! in_array( $uri, $editor_style ) )
+            $editor_style[] = $uri;
+    }
     add_filter( 'mce_css', '_editor_style_cb' );
 }
 
 /**
- * Callback for custom editor stylesheet.
+ * Callback for custom editor stylesheet support.
  *
  * @since 3.0.0
@@ -1481 +1494 @@
     if ( ! empty( $url ) )
         $url .= ',';
-    return $url . get_stylesheet_directory_uri() . "/$editor_style";
+    return $url . implode( ',', $editor_style );
 }