<!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>[13453] trunk: add_editor_style() third pass.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13453">13453</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-27 07:36:35 +0000 (Sat, 27 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add_editor_style() third pass. better performance and better child theme support. see <a href="http://trac.wordpress.org/ticket/11512">#11512</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13452 => 13453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-02-27 07:24:41 UTC (rev 13452)
+++ trunk/wp-admin/includes/post.php 2010-02-27 07:36:35 UTC (rev 13453)
</span><span class="lines">@@ -1305,7 +1305,7 @@
</span><span class="cx"> * @param mixed $settings optional An array that can add to or overwrite the default TinyMCE settings.
</span><span class="cx"> */
</span><span class="cx"> function wp_tiny_mce( $teeny = false, $settings = false ) {
</span><del>- global $concatenate_scripts, $compress_scripts, $tinymce_version;
</del><ins>+ global $concatenate_scripts, $compress_scripts, $tinymce_version, $editor_styles;
</ins><span class="cx">
</span><span class="cx"> if ( ! user_can_richedit() )
</span><span class="cx"> return;
</span><span class="lines">@@ -1467,8 +1467,30 @@
</span><span class="cx"> 'plugins' => $plugins
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $mce_css = trim(apply_filters('mce_css', ''), ' ,');
</del><ins>+ if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
+ $mce_css = array();
+ $style_uri = get_stylesheet_directory_uri();
+ if ( TEMPLATEPATH == STYLESHEETPATH ) {
+ foreach ( $editor_styles as $file )
+ $mce_css[] = "$style_uri/$file";
+ } else {
+ $style_dir = get_stylesheet_directory();
+ $template_uri = get_template_directory_uri();
+ $template_dir = get_template_directory();
+ foreach ( $editor_styles as $file ) {
+ if ( file_exists( "$style_dir/$file" ) )
+ $mce_css[] = "$style_uri/$file";
+ if ( file_exists( "$template_dir/$file" ) )
+ $mce_css[] = "$template_uri/$file";
+ }
+ }
+ $mce_css = implode( ',', $mce_css );
+ } else {
+ $mce_css = '';
+ }
</ins><span class="cx">
</span><ins>+ $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
+
</ins><span class="cx"> if ( ! empty($mce_css) )
</span><span class="cx"> $initArray['content_css'] = $mce_css;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13452 => 13453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-02-27 07:24:41 UTC (rev 13452)
+++ trunk/wp-includes/theme.php 2010-02-27 07:36:35 UTC (rev 13453)
</span><span class="lines">@@ -1465,38 +1465,13 @@
</span><span class="cx"> if ( ! is_admin() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- 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' );
</del><ins>+ global $editor_styles;
+ $editor_styles = (array) $editor_styles;
+ $stylesheet = (array) $stylesheet;
+ $editor_styles = array_merge( $editor_styles, $stylesheet );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Callback for custom editor stylesheet support.
- *
- * @since 3.0.0
- * @see add_editor_style()
- * @access protected
- */
-function _editor_style_cb( $url ) {
- global $editor_style;
- if ( ! empty( $url ) )
- $url .= ',';
- return $url . implode( ',', $editor_style );
-}
-
-/**
</del><span class="cx"> * Allows a theme to register its support of a certain feature
</span><span class="cx"> *
</span><span class="cx"> * Must be called in the themes functions.php file to work.
</span><span class="lines">@@ -1520,7 +1495,6 @@
</span><span class="cx"> * @param string $feature the feature being checked
</span><span class="cx"> * @return boolean
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> function current_theme_supports( $feature ) {
</span><span class="cx"> global $_wp_theme_features;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>