<!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>[18610] trunk/wp-includes: Fix action 'wp_print_footer_scropts' (on the front-end), see #11520</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/18610">18610</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-08-26 20:31:30 +0000 (Fri, 26 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix action 'wp_print_footer_scropts' (on the front-end), see <a href="http://core.trac.wordpress.org/ticket/11520">#11520</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (18609 => 18610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2011-08-26 19:33:14 UTC (rev 18609)
+++ trunk/wp-includes/default-filters.php 2011-08-26 20:31:30 UTC (rev 18610)
</span><span class="lines">@@ -214,16 +214,17 @@
</span><span class="cx"> add_action( 'wp_head', 'wp_print_head_scripts', 9 );
</span><span class="cx"> add_action( 'wp_head', 'wp_generator' );
</span><span class="cx"> add_action( 'wp_head', 'rel_canonical' );
</span><del>-add_action( 'wp_footer', 'wp_print_footer_scripts' );
</del><ins>+add_action( 'wp_footer', 'wp_print_footer_scripts', 20 );
</ins><span class="cx"> add_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
</span><span class="cx"> add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 );
</span><ins>+add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_GET['replytocom'] ) )
</span><span class="cx"> add_filter( 'pre_option_blog_public', '__return_zero' );
</span><span class="cx">
</span><span class="cx"> // Login actions
</span><span class="cx"> add_action( 'login_head', 'wp_print_head_scripts', 9 );
</span><del>-add_action( 'login_footer', 'wp_print_footer_scripts' );
</del><ins>+add_action( 'login_footer', 'wp_print_footer_scripts', 20 );
</ins><span class="cx"> add_action( 'login_init', 'send_frame_options_header', 10, 0 );
</span><span class="cx">
</span><span class="cx"> // Feed Generator Tags
</span><span class="lines">@@ -244,7 +245,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', 'wp_print_footer_scripts', 20 );
</del><ins>+add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' );
</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 class="lines">@@ -284,4 +285,4 @@
</span><span class="cx">
</span><span class="cx"> unset($filter, $action);
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18609 => 18610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-08-26 19:33:14 UTC (rev 18609)
+++ trunk/wp-includes/script-loader.php 2011-08-26 20:31:30 UTC (rev 18610)
</span><span class="lines">@@ -626,18 +626,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Private, for use in *_footer_scripts hooks
+ *
+ * @since 3.3
+ */
+function _wp_footer_scripts() {
+ print_late_styles();
+ print_footer_scripts();
+}
+
+/**
</ins><span class="cx"> * Hooks to print the scripts and styles in the footer.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8
</span><span class="cx"> */
</span><span class="cx"> function wp_print_footer_scripts() {
</span><del>- print_late_styles();
- print_footer_scripts();
-
- if ( !is_admin() )
- do_action('wp_print_footer_scripts');
-
- return true;
</del><ins>+ do_action('wp_print_footer_scripts');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>