<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13444] trunk/wp-includes/theme.php: add_editor_style(), second pass.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13444">13444</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 21:07:41 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add_editor_style(), second pass. Accept an array of stylesheets, also allow multiple calls to the function. Support child themes. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a> see <a href="http://trac.wordpress.org/ticket/11512">#11512</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13443 => 13444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-02-26 20:23:25 UTC (rev 13443)
+++ trunk/wp-includes/theme.php 2010-02-26 21:07:41 UTC (rev 13444)
</span><span class="lines">@@ -1447,30 +1447,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add callback for a custom TinyMCE editor stylesheet.
</del><ins>+ * Add callback for custom TinyMCE editor stylesheets.
</ins><span class="cx"> *
</span><span class="cx"> * The parameter $stylesheet is the name of the stylesheet, relative to
</span><del>- * the theme root. It is optional and defaults to 'editor-style.css'.
</del><ins>+ * the theme root. It also accepts an array of stylesheets.
+ * It is optional and defaults to 'editor-style.css'.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param callback $stylesheet Name of stylesheet relative to theme root.
</del><ins>+ * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * Defaults to 'editor-style.css'
</ins><span class="cx"> */
</span><span class="cx"> function add_editor_style( $stylesheet = 'editor-style.css' ) {
</span><del>- if ( isset( $GLOBALS['editor_style'] ) )
- return;
</del><span class="cx">
</span><span class="cx"> add_theme_support( 'editor-style' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_admin() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $GLOBALS['editor_style'] = $stylesheet;
</del><ins>+ 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;
+ }
</ins><span class="cx"> add_filter( 'mce_css', '_editor_style_cb' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Callback for custom editor stylesheet.
</del><ins>+ * Callback for custom editor stylesheet support.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @see add_editor_style()
</span><span class="lines">@@ -1480,7 +1493,7 @@
</span><span class="cx"> global $editor_style;
</span><span class="cx"> if ( ! empty( $url ) )
</span><span class="cx"> $url .= ',';
</span><del>- return $url . get_stylesheet_directory_uri() . "/$editor_style";
</del><ins>+ return $url . implode( ',', $editor_style );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>