<!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>[21672] trunk/wp-includes: Have wp_script_is() and wp_style_is() accept 'enqueued', as it reads better than 'queue' and is consistent with 'registered'.</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/21672">21672</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-08-30 18:57:57 +0000 (Thu, 30 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have wp_script_is() and wp_style_is() accept 'enqueued', as it reads better than 'queue' and is consistent with 'registered'. fixes <a href="http://core.trac.wordpress.org/ticket/21741">#21741</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpdependenciesphp">trunk/wp-includes/class.wp-dependencies.php</a></li>
<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="trunkwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-dependencies.php (21671 => 21672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-dependencies.php 2012-08-30 18:47:22 UTC (rev 21671)
+++ trunk/wp-includes/class.wp-dependencies.php 2012-08-30 18:57:57 UTC (rev 21672)
</span><span class="lines">@@ -196,24 +196,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function query( $handle, $list = 'registered' ) { // registered, queue, done, to_do
- switch ( $list ) :
- case 'registered':
- case 'scripts': // back compat
- if ( isset($this->registered[$handle]) )
- return $this->registered[$handle];
- break;
- case 'to_print': // back compat
- case 'printed': // back compat
- if ( 'to_print' == $list )
- $list = 'to_do';
- else
- $list = 'printed';
- default:
- if ( in_array($handle, $this->$list) )
- return true;
- break;
- endswitch;
</del><ins>+
+ function query( $handle, $list = 'registered' ) {
+ switch ( $list ) {
+ case 'registered' :
+ case 'scripts': // back compat
+ if ( isset( $this->registered[ $handle ] ) )
+ return $this->registered[ $handle ];
+ return false;
+
+ case 'enqueued' :
+ case 'queue' :
+ return in_array( $handle, $this->queue );
+
+ case 'to_do' :
+ case 'to_print': // back compat
+ return in_array( $handle, $this->to_do );
+
+ case 'done' :
+ case 'printed': // back compat
+ return in_array( $handle, $this->done );
+ }
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (21671 => 21672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2012-08-30 18:47:22 UTC (rev 21671)
+++ trunk/wp-includes/functions.wp-scripts.php 2012-08-30 18:57:57 UTC (rev 21672)
</span><span class="lines">@@ -161,16 +161,18 @@
</span><span class="cx"> /**
</span><span class="cx"> * Check whether script has been added to WordPress Scripts.
</span><span class="cx"> *
</span><del>- * The values for list defaults to 'queue', which is the same as enqueue for
- * scripts.
</del><ins>+ * By default, checks if the script has been enqueued. You can also
+ * pass 'registered' to $list, to see if the script is registered,
+ * and you can check processing statuses with 'to_do' and 'done'.
</ins><span class="cx"> *
</span><span class="cx"> * @since WP unknown; BP unknown
</span><span class="cx"> *
</span><del>- * @param string $handle Handle used to add script.
- * @param string $list Optional, defaults to 'queue'. Others values are 'registered', 'queue', 'done', 'to_do'
- * @return bool
</del><ins>+ * @param string $handle Name of the script.
+ * @param string $list Optional. Defaults to 'enqueued'. Values are
+ * 'registered', 'enqueued' (or 'queue'), 'to_do', and 'done'.
+ * @return bool Whether script is in the list.
</ins><span class="cx"> */
</span><del>-function wp_script_is( $handle, $list = 'queue' ) {
</del><ins>+function wp_script_is( $handle, $list = 'enqueued' ) {
</ins><span class="cx"> global $wp_scripts;
</span><span class="cx"> if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</span><span class="cx"> if ( ! did_action( 'init' ) )
</span><span class="lines">@@ -179,10 +181,5 @@
</span><span class="cx"> $wp_scripts = new WP_Scripts();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $query = $wp_scripts->query( $handle, $list );
-
- if ( is_object( $query ) )
- return true;
-
- return $query;
</del><ins>+ return (bool) $wp_scripts->query( $handle, $list );
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-styles.php (21671 => 21672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-styles.php 2012-08-30 18:47:22 UTC (rev 21671)
+++ trunk/wp-includes/functions.wp-styles.php 2012-08-30 18:57:57 UTC (rev 21672)
</span><span class="lines">@@ -167,16 +167,19 @@
</span><span class="cx"> /**
</span><span class="cx"> * Check whether style has been added to WordPress Styles.
</span><span class="cx"> *
</span><del>- * The values for list defaults to 'queue', which is the same as wp_enqueue_style().
</del><ins>+ * By default, checks if the style has been enqueued. You can also
+ * pass 'registered' to $list, to see if the style is registered,
+ * and you can check processing statuses with 'to_do' and 'done'.
</ins><span class="cx"> *
</span><span class="cx"> * @since WP unknown; BP unknown
</span><span class="cx"> * @global object $wp_styles The WP_Styles object for printing styles.
</span><span class="cx"> *
</span><span class="cx"> * @param string $handle Name of the stylesheet.
</span><del>- * @param string $list Values are 'registered', 'done', 'queue' and 'to_do'.
- * @return bool True on success, false on failure.
</del><ins>+ * @param string $list Optional. Defaults to 'enqueued'. Values are
+ * 'registered', 'enqueued' (or 'queue'), 'to_do', and 'done'.
+ * @return bool Whether style is in the list.
</ins><span class="cx"> */
</span><del>-function wp_style_is( $handle, $list = 'queue' ) {
</del><ins>+function wp_style_is( $handle, $list = 'enqueued' ) {
</ins><span class="cx"> global $wp_styles;
</span><span class="cx"> if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
</span><span class="cx"> if ( ! did_action( 'init' ) )
</span><span class="lines">@@ -185,10 +188,5 @@
</span><span class="cx"> $wp_styles = new WP_Styles();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $query = $wp_styles->query( $handle, $list );
-
- if ( is_object( $query ) )
- return true;
-
- return $query;
</del><ins>+ return (bool) $wp_styles->query( $handle, $list );
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>