<!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>[18446] trunk/wp-includes: Support for using wp_enqueue_script() and wp_enqueue_style() in the HTML body.</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, #logmsg > ol { margin-left: 0; 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/18446">18446</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-07-21 16:32:01 +0000 (Thu, 21 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support for using wp_enqueue_script() and wp_enqueue_style() in the HTML body. All scripts and styles are added in the footer, fixes <a href="http://core.trac.wordpress.org/ticket/9346">#9346</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpdependenciesphp">trunk/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunkwpincludesclasswpscriptsphp">trunk/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesclasswpstylesphp">trunk/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-dependencies.php (18445 => 18446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-dependencies.php 2011-07-20 22:04:35 UTC (rev 18445)
+++ trunk/wp-includes/class.wp-dependencies.php 2011-07-21 16:32:01 UTC (rev 18446)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $this->all_deps( $handles );
</span><span class="cx">
</span><span class="cx"> foreach( $this->to_do as $key => $handle ) {
</span><del>- if ( !in_array($handle, $this->done) && isset($this->registered[$handle]) ) {
</del><ins>+ if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->registered[$handle]->src ) { // Defines a group.
</span><span class="cx"> $this->done[] = $handle;
</span></span></pre></div>
<a id="trunkwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-scripts.php (18445 => 18446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-scripts.php 2011-07-20 22:04:35 UTC (rev 18445)
+++ trunk/wp-includes/class.wp-scripts.php 2011-07-21 16:32:01 UTC (rev 18446)
</span><span class="lines">@@ -167,15 +167,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function do_footer_items() {
</span><del>- if ( !empty($this->in_footer) ) {
- foreach( $this->in_footer as $key => $handle ) {
- if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
- $this->do_item($handle);
- $this->done[] = $handle;
- unset( $this->in_footer[$key] );
- }
- }
- }
</del><ins>+ $this->do_items(false, 1);
</ins><span class="cx"> return $this->done;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-styles.php (18445 => 18446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-styles.php 2011-07-20 22:04:35 UTC (rev 18445)
+++ trunk/wp-includes/class.wp-styles.php 2011-07-21 16:32:01 UTC (rev 18446)
</span><span class="lines">@@ -122,5 +122,17 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+ function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
+ $this->do_items(false, 1);
+ return $this->done;
+ }
</ins><span class="cx">
</span><ins>+ function reset() {
+ $this->do_concat = false;
+ $this->concat = '';
+ $this->concat_version = '';
+ $this->print_html = '';
+ }
</ins><span class="cx"> }
</span><ins>+
</ins></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (18445 => 18446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2011-07-20 22:04:35 UTC (rev 18445)
+++ trunk/wp-includes/default-filters.php 2011-07-21 16:32:01 UTC (rev 18446)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> add_action( 'do_robots', 'do_robots' );
</span><span class="cx"> add_action( 'sanitize_comment_cookies', 'sanitize_comment_cookies' );
</span><span class="cx"> add_action( 'admin_print_scripts', 'print_head_scripts', 20 );
</span><del>-add_action( 'admin_print_footer_scripts', 'print_footer_scripts', 20 );
</del><ins>+add_action( 'admin_print_footer_scripts', 'wp_print_footer_scripts', 20 );
</ins><span class="cx"> add_action( 'admin_print_styles', 'print_admin_styles', 20 );
</span><span class="cx"> add_action( 'init', 'smilies_init', 5 );
</span><span class="cx"> add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18445 => 18446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-07-20 22:04:35 UTC (rev 18445)
+++ trunk/wp-includes/script-loader.php 2011-07-21 16:32:01 UTC (rev 18446)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
</span><span class="cx"> $styles->default_version = get_bloginfo( 'version' );
</span><span class="cx"> $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
</span><del>- $styles->default_dirs = array('/wp-admin/');
</del><ins>+ $styles->default_dirs = array('/wp-admin/', '/wp-includes/');
</ins><span class="cx">
</span><span class="cx"> $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
</span><span class="cx">
</span><span class="lines">@@ -723,7 +723,9 @@
</span><span class="cx"> * @since 2.8
</span><span class="cx"> */
</span><span class="cx"> function wp_print_footer_scripts() {
</span><del>- return print_footer_scripts();
</del><ins>+ print_late_styles();
+ print_footer_scripts();
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -752,23 +754,47 @@
</span><span class="cx">
</span><span class="cx"> $wp_styles->do_items(false);
</span><span class="cx">
</span><del>- if ( apply_filters('print_admin_styles', true) ) {
- if ( !empty($wp_styles->concat) ) {
- $dir = $wp_styles->text_direction;
- $ver = md5("$wp_styles->concat_version{$dir}");
- $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . "&ver=$ver";
- echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
- }
</del><ins>+ if ( apply_filters('print_admin_styles', true) )
+ _print_styles();
</ins><span class="cx">
</span><del>- if ( !empty($wp_styles->print_html) )
- echo $wp_styles->print_html;
- }
</del><ins>+ $wp_styles->reset();
+ return $wp_styles->done;
+}
</ins><span class="cx">
</span><del>- $wp_styles->do_concat = false;
- $wp_styles->concat = $wp_styles->concat_version = $wp_styles->print_html = '';
</del><ins>+function print_late_styles() {
+ global $wp_styles, $concatenate_scripts;
+
+ if ( !is_a($wp_styles, 'WP_Styles') )
+ return;
+
+ $wp_styles->do_concat = $concatenate_scripts;
+ $wp_styles->do_footer_items();
+
+ if ( apply_filters('print_late_styles', true) )
+ _print_styles();
+
+ $wp_styles->reset();
</ins><span class="cx"> return $wp_styles->done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function _print_styles() {
+ global $wp_styles, $compress_css;
+
+ $zip = $compress_css ? 1 : 0;
+ if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+ $zip = 'gzip';
+
+ if ( !empty($wp_styles->concat) ) {
+ $dir = $wp_styles->text_direction;
+ $ver = md5("$wp_styles->concat_version{$dir}");
+ $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . "&ver=$ver";
+ echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+ }
+
+ if ( !empty($wp_styles->print_html) )
+ echo $wp_styles->print_html;
+}
+
</ins><span class="cx"> function script_concat_settings() {
</span><span class="cx"> global $concatenate_scripts, $compress_scripts, $compress_css;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>