<!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>[36550] trunk: Script/Style Dependencies: Make sure that inline styles for handles without a source are printed.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36550">36550</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36550","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-17 17:10:53 +0000 (Wed, 17 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Script/Style Dependencies: Make sure that inline styles for handles without a source are printed.
This prevents breaking plugins which are adding inline styles to the `wp-admin` handle after <a href="https://core.trac.wordpress.org/changeset/36341">[36341]</a>.
Props dd32, ocean90.
Fixes <a href="https://core.trac.wordpress.org/ticket/35229">#35229</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpdependenciesphp">trunk/src/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesstylesphp">trunk/tests/phpunit/tests/dependencies/styles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-dependencies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-dependencies.php 2016-02-17 16:07:01 UTC (rev 36549)
+++ trunk/src/wp-includes/class.wp-dependencies.php 2016-02-17 17:10:53 UTC (rev 36550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,22 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->to_do as $key => $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A single item may alias a set of items, by having dependencies,
- * but no source. Queuing the item queues the dependencies.
- *
- * Example: The extending class WP_Scripts is used to register 'scriptaculous' as a set of registered handles:
- * <code>add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );</code>
- *
- * The src property is false.
- */
- if ( ! $this->registered[$handle]->src ) {
- $this->done[] = $handle;
- continue;
- }
-
- /*
</del><span class="cx" style="display: block; padding: 0 10px"> * Attempt to process the item. If successful,
</span><span class="cx" style="display: block; padding: 0 10px"> * add the handle to the done array.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-scripts.php 2016-02-17 16:07:01 UTC (rev 36549)
+++ trunk/src/wp-includes/class.wp-scripts.php 2016-02-17 17:10:53 UTC (rev 36550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,6 +177,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $cond_after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A single item may alias a set of items, by having dependencies, but no source.
+ if ( ! $obj->src ) {
+ return true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = $this->base_url . $src;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-styles.php 2016-02-17 16:07:01 UTC (rev 36549)
+++ trunk/src/wp-includes/class.wp-styles.php 2016-02-17 17:10:53 UTC (rev 36550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,11 +72,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $media = 'all';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $href = $this->_css_href( $obj->src, $ver, $handle );
- if ( empty( $href ) ) {
- // Turns out there is nothing to print.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A single item may alias a set of items, by having dependencies, but no source.
+ if ( ! $obj->src ) {
+ if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
+ $inline_style = sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+ if ( $this->do_concat ) {
+ $this->print_html .= $inline_style;
+ } else {
+ echo $inline_style;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $href = $this->_css_href( $obj->src, $ver, $handle );
</ins><span class="cx" style="display: block; padding: 0 10px"> $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2016-02-17 16:07:01 UTC (rev 36549)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2016-02-17 17:10:53 UTC (rev 36550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,4 +166,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_register_script( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 35229
+ */
+ function test_wp_register_script_with_handle_without_source() {
+ $expected = "<script type='text/javascript' src='http://example.com?ver=1'></script>\n";
+ $expected .= "<script type='text/javascript' src='http://example.com?ver=2'></script>\n";
+
+ wp_register_script( 'handle-one', 'http://example.com', array(), 1 );
+ wp_register_script( 'handle-two', 'http://example.com', array(), 2 );
+ wp_register_script( 'handle-three', false, array( 'handle-one', 'handle-two' ) );
+
+ wp_enqueue_script( 'handle-three' );
+
+ $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/styles.php 2016-02-17 16:07:01 UTC (rev 36549)
+++ trunk/tests/phpunit/tests/dependencies/styles.php 2016-02-17 17:10:53 UTC (rev 36550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,9 +234,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31126
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_register_style(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_wp_register_style() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_register_style( 'duplicate-handler', 'http://example.com' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 35229
+ */
+ function test_wp_add_inline_style_for_handle_without_source() {
+ $style = "a { color: blue; }";
+
+ $expected = "<link rel='stylesheet' id='handle-one-css' href='http://example.com?ver=1' type='text/css' media='all' />\n";
+ $expected .= "<link rel='stylesheet' id='handle-two-css' href='http://example.com?ver=1' type='text/css' media='all' />\n";
+ $expected .= "<style id='handle-three-inline-css' type='text/css'>\n";
+ $expected .= "$style\n";
+ $expected .= "</style>\n";
+
+ wp_register_style( 'handle-one', 'http://example.com', array(), 1 );
+ wp_register_style( 'handle-two', 'http://example.com', array(), 1 );
+ wp_register_style( 'handle-three', false, array( 'handle-one', 'handle-two' ) );
+
+ wp_enqueue_style( 'handle-three' );
+ wp_add_inline_style( 'handle-three', $style );
+
+ $this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>