<!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>[18561] trunk/wp-includes: Call _doing_it_wrong() individually in wp_scripts and wp_styles functions.</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/18561">18561</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-08-17 21:02:43 +0000 (Wed, 17 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call _doing_it_wrong() individually in wp_scripts and wp_styles functions. Partially reverts <a href="http://core.trac.wordpress.org/changeset/18556">[18556]</a>, <a href="http://core.trac.wordpress.org/changeset/18557">[18557]</a>, removes wp_styles_init(), wp_scripts_init(). fixes <a href="http://core.trac.wordpress.org/ticket/11526">#11526</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesfunctionswpstylesphp">trunk/wp-includes/functions.wp-styles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (18560 => 18561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2011-08-17 17:49:57 UTC (rev 18560)
+++ trunk/wp-includes/functions.wp-scripts.php 2011-08-17 21:02:43 UTC (rev 18561)
</span><span class="lines">@@ -24,7 +24,11 @@
</span><span class="cx"> $handles = false;
</span><span class="cx">
</span><span class="cx"> global $wp_scripts;
</span><del>- if ( !is_a($wp_scripts, 'WP_Scripts') ) {
</del><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+
</ins><span class="cx"> if ( !$handles )
</span><span class="cx"> return array(); // No need to instantiate if nothing is there.
</span><span class="cx"> else
</span><span class="lines">@@ -47,9 +51,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_scripts = new WP_Scripts();
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> $wp_scripts->add( $handle, $src, $deps, $ver );
</span><span class="cx"> if ( $in_footer )
</span><span class="cx"> $wp_scripts->add_data( $handle, 'group', 1 );
</span><span class="lines">@@ -75,9 +83,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_localize_script( $handle, $name, $data ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ return false;
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> return $wp_scripts->add_script_data( $handle, $name, $data );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -89,9 +101,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_deregister_script( $handle ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_scripts = new WP_Scripts();
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> $wp_scripts->remove( $handle );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,9 +121,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_scripts = new WP_Scripts();
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> if ( $src ) {
</span><span class="cx"> $_handle = explode('?', $handle);
</span><span class="cx"> $wp_scripts->add( $_handle[0], $src, $deps, $ver );
</span><span class="lines">@@ -125,9 +145,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_dequeue_script( $handle ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_scripts = new WP_Scripts();
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> $wp_scripts->dequeue( $handle );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -145,9 +169,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_script_is( $handle, $list = 'queue' ) {
</span><span class="cx"> global $wp_scripts;
</span><ins>+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_scripts = new WP_Scripts();
+ }
</ins><span class="cx">
</span><del>- wp_scripts_init();
-
</del><span class="cx"> $query = $wp_scripts->query( $handle, $list );
</span><span class="cx">
</span><span class="cx"> if ( is_object( $query ) )
</span><span class="lines">@@ -155,22 +183,3 @@
</span><span class="cx">
</span><span class="cx"> return $query;
</span><span class="cx"> }
</span><del>-
-/**
- * Initializes $wp_scripts global (if it hasn't already been initialized by a faulty plugin or theme).
- *
- * @since 3.3
- */
-function wp_scripts_init() {
- global $wp_scripts;
- static $done = false;
-
- if ( !$done && !is_a($wp_scripts, 'WP_Scripts') ) {
- if ( !did_action('after_setup_theme') ) // last action before init
- _doing_it_wrong( __FUNCTION__, __( '$wp_scripts should not be accessed before the "init" hook.' ), '3.3' );
-
- $wp_scripts = new WP_Scripts();
- $done = true;
- }
-}
-
</del></span></pre></div>
<a id="trunkwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-styles.php (18560 => 18561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-styles.php 2011-08-17 17:49:57 UTC (rev 18560)
+++ trunk/wp-includes/functions.wp-styles.php 2011-08-17 21:02:43 UTC (rev 18561)
</span><span class="lines">@@ -23,7 +23,11 @@
</span><span class="cx"> $handles = false;
</span><span class="cx">
</span><span class="cx"> global $wp_styles;
</span><del>- if ( !is_a($wp_styles, 'WP_Styles') ) {
</del><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+
</ins><span class="cx"> if ( !$handles )
</span><span class="cx"> return array(); // No need to instantiate if nothing is there.
</span><span class="cx"> else
</span><span class="lines">@@ -46,8 +50,12 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_add_inline_style( $handle, $data ) {
</span><span class="cx"> global $wp_styles;
</span><del>- if ( !is_a($wp_styles, 'WP_Styles') )
- return false;
</del><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><span class="cx"> return $wp_styles->add_inline_style( $handle, $data );
</span><span class="cx"> }
</span><span class="lines">@@ -70,9 +78,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
</span><span class="cx"> global $wp_styles;
</span><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><del>- wp_styles_init();
-
</del><span class="cx"> $wp_styles->add( $handle, $src, $deps, $ver, $media );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -87,9 +99,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_deregister_style( $handle ) {
</span><span class="cx"> global $wp_styles;
</span><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><del>- wp_styles_init();
-
</del><span class="cx"> $wp_styles->remove( $handle );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,9 +130,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
</span><span class="cx"> global $wp_styles;
</span><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><del>- wp_styles_init();
-
</del><span class="cx"> if ( $src ) {
</span><span class="cx"> $_handle = explode('?', $handle);
</span><span class="cx"> $wp_styles->add( $_handle[0], $src, $deps, $ver, $media );
</span><span class="lines">@@ -132,9 +152,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_dequeue_style( $handle ) {
</span><span class="cx"> global $wp_styles;
</span><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><del>- wp_styles_init();
-
</del><span class="cx"> $wp_styles->dequeue( $handle );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,9 +176,13 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_style_is( $handle, $list = 'queue' ) {
</span><span class="cx"> global $wp_styles;
</span><ins>+ if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ '<code>wp_enqueue_scripts</code>', '<code>admin_enqueue_scripts</code>', '<code>init</code>' ), '3.3' );
+ $wp_styles = new WP_Styles();
+ }
</ins><span class="cx">
</span><del>- wp_styles_init();
-
</del><span class="cx"> $query = $wp_styles->query( $handle, $list );
</span><span class="cx">
</span><span class="cx"> if ( is_object( $query ) )
</span><span class="lines">@@ -162,22 +190,3 @@
</span><span class="cx">
</span><span class="cx"> return $query;
</span><span class="cx"> }
</span><del>-
-/**
- * Initializes $wp_styles global (if it hasn't already been initialized by a faulty plugin or theme).
- *
- * @since 3.3
- */
-function wp_styles_init() {
- global $wp_styles;
- static $done = false;
-
- if ( !$done && !is_a($wp_styles, 'WP_Styles') ) {
- if ( !did_action('after_setup_theme') )
- _doing_it_wrong( __FUNCTION__, __( '$wp_styles should not be accessed before the "init" hook.' ), '3.3' );
-
- $wp_styles = new WP_Styles();
- $done = true;
- }
-}
-
</del></span></pre>
</div>
</div>
</body>
</html>