<!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" />
<title>[27515] trunk/src/wp-includes: Revert [27203], restore JIT color scheme stylesheets.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27515">27515</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-12 16:11:38 +0000 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/27203">[27203]</a>, restore JIT color scheme stylesheets. Restores <a href="http://core.trac.wordpress.org/changeset/27111">[27111]</a>.
fixes <a href="http://core.trac.wordpress.org/ticket/27175">#27175</a>. see <a href="http://core.trac.wordpress.org/ticket/20729">#20729</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class.wp-styles.php (27514 => 27515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class.wp-styles.php 2014-03-12 12:53:49 UTC (rev 27514)
+++ trunk/src/wp-includes/class.wp-styles.php 2014-03-12 16:11:38 UTC (rev 27515)
</span><span class="lines">@@ -62,6 +62,10 @@
</span><span class="cx"> $media = 'all';
</span><span class="cx">
</span><span class="cx"> $href = $this->_css_href( $obj->src, $ver, $handle );
</span><ins>+ if ( empty( $href ) ) {
+ // Turns out there is nothing to print.
+ return true;
+ }
</ins><span class="cx"> $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
</span><span class="cx"> $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/deprecated.php (27514 => 27515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/deprecated.php 2014-03-12 12:53:49 UTC (rev 27514)
+++ trunk/src/wp-includes/deprecated.php 2014-03-12 16:11:38 UTC (rev 27515)
</span><span class="lines">@@ -3412,15 +3412,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Callback formerly fired on the style_loader_src hook. No longer needed.
- *
- * @since 2.6.0
- * @deprecated 3.9.0
- */
-function wp_style_loader_src() {}
-
-
-/**
</del><span class="cx"> * Old callback for tag link tooltips.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (27514 => 27515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2014-03-12 12:53:49 UTC (rev 27514)
+++ trunk/src/wp-includes/script-loader.php 2014-03-12 16:11:38 UTC (rev 27515)
</span><span class="lines">@@ -581,15 +581,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Register a stylesheet for the selected admin color scheme.
</span><del>- $colors_url = false;
- if ( ! empty( $GLOBALS['_wp_admin_css_colors'] ) ) {
- $color = get_user_option( 'admin_color' );
- if ( ! $color || ! isset( $GLOBALS['_wp_admin_css_colors'][ $color ] ) ) {
- $color = 'fresh';
- }
- $colors_url = $GLOBALS['_wp_admin_css_colors'][ $color ]->url;
- }
- $styles->add( 'colors', $colors_url, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
</del><ins>+ $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
</ins><span class="cx">
</span><span class="cx"> $suffix = SCRIPT_DEBUG ? '' : '.min';
</span><span class="cx">
</span><span class="lines">@@ -689,6 +681,57 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Administration Screen CSS for changing the styles.
+ *
+ * If installing the 'wp-admin/' directory will be replaced with './'.
+ *
+ * The $_wp_admin_css_colors global manages the Administration Screens CSS
+ * stylesheet that is loaded. The option that is set is 'admin_color' and is the
+ * color and key for the array. The value for the color key is an object with
+ * a 'url' parameter that has the URL path to the CSS file.
+ *
+ * The query from $src parameter will be appended to the URL that is given from
+ * the $_wp_admin_css_colors array value URL.
+ *
+ * @since 2.6.0
+ * @uses $_wp_admin_css_colors
+ *
+ * @param string $src Source URL.
+ * @param string $handle Either 'colors' or 'colors-rtl'.
+ * @return string URL path to CSS stylesheet for Administration Screens.
+ */
+function wp_style_loader_src( $src, $handle ) {
+ global $_wp_admin_css_colors;
+
+ if ( defined('WP_INSTALLING') )
+ return preg_replace( '#^wp-admin/#', './', $src );
+
+ if ( 'colors' == $handle ) {
+ $color = get_user_option('admin_color');
+
+ if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+ $color = 'fresh';
+
+ $color = $_wp_admin_css_colors[$color];
+ $parsed = parse_url( $src );
+ $url = $color->url;
+
+ if ( ! $url ) {
+ return false;
+ }
+
+ if ( isset($parsed['query']) && $parsed['query'] ) {
+ wp_parse_str( $parsed['query'], $qv );
+ $url = add_query_arg( $qv, $url );
+ }
+
+ return $url;
+ }
+
+ return $src;
+}
+
+/**
</ins><span class="cx"> * Prints the script queue in the HTML head on admin pages.
</span><span class="cx"> *
</span><span class="cx"> * Postpones the scripts that were queued for the footer.
</span><span class="lines">@@ -934,3 +977,4 @@
</span><span class="cx"> add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
</span><span class="cx">
</span><span class="cx"> add_action( 'wp_default_styles', 'wp_default_styles' );
</span><ins>+add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
</ins></span></pre>
</div>
</div>
</body>
</html>