<!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>[16688] trunk/wp-admin/includes/post.php:
add_editor_style should include the parent theme CSS before the child theme CSS for override reasons
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16688">16688</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-02 13:54:56 +0000 (Thu, 02 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add_editor_style should include the parent theme CSS before the child theme CSS for override reasons. props JohnPBloch. fixes <a href="http://trac.wordpress.org/ticket/14430">#14430</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.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 (16687 => 16688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-12-02 12:44:48 UTC (rev 16687)
+++ trunk/wp-admin/includes/post.php 2010-12-02 13:54:56 UTC (rev 16688)
</span><span class="lines">@@ -1545,7 +1545,7 @@
</span><span class="cx"> if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
</span><span class="cx"> $mce_css = array();
</span><span class="cx"> $style_uri = get_stylesheet_directory_uri();
</span><del>- if ( TEMPLATEPATH == STYLESHEETPATH ) {
</del><ins>+ if ( ! is_child_theme() ) {
</ins><span class="cx"> foreach ( $editor_styles as $file )
</span><span class="cx"> $mce_css[] = "$style_uri/$file";
</span><span class="cx"> } else {
</span><span class="lines">@@ -1553,10 +1553,10 @@
</span><span class="cx"> $template_uri = get_template_directory_uri();
</span><span class="cx"> $template_dir = get_template_directory();
</span><span class="cx"> foreach ( $editor_styles as $file ) {
</span><ins>+ if ( file_exists( "$template_dir/$file" ) )
+ $mce_css[] = "$template_uri/$file";
</ins><span class="cx"> if ( file_exists( "$style_dir/$file" ) )
</span><span class="cx"> $mce_css[] = "$style_uri/$file";
</span><del>- if ( file_exists( "$template_dir/$file" ) )
- $mce_css[] = "$template_uri/$file";
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $mce_css = implode( ',', $mce_css );
</span></span></pre>
</div>
</div>
</body>
</html>