Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / functions.wp-styles.php

diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php
index 8896615438fd1e5e058e5920f2a0091b7b387e71..49095f3b7ae16a90f22f80678789e01a63e757c6 100644 (file)
--- a/wp-includes/functions.wp-styles.php
+++ b/wp-includes/functions.wp-styles.php
@@ -167,16 +167,19 @@ function wp_dequeue_style( $handle ) {
 /**
  * Check whether style has been added to WordPress Styles.
  *
 /**
  * Check whether style has been added to WordPress Styles.
  *

- * The values for list defaults to 'queue', which is the same as wp_enqueue_style().
+ * 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'.

  *
  * @since WP unknown; BP unknown
  * @global object $wp_styles The WP_Styles object for printing styles.
  *
  * @param string $handle Name of the stylesheet.
  *
  * @since WP unknown; BP unknown
  * @global object $wp_styles The WP_Styles object for printing styles.
  *
  * @param string $handle Name of the stylesheet.

- * @param string $list Values are 'registered', 'done', 'queue' and 'to_do'.
- * @return bool True on success, false on failure.
+ * @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.

  */
  */

-function wp_style_is( $handle, $list = 'queue' ) {
+function wp_style_is( $handle, $list = 'enqueued' ) {

        global $wp_styles;
        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
                if ( ! did_action( 'init' ) )
        global $wp_styles;
        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
                if ( ! did_action( 'init' ) )


@@ -185,10 +188,5 @@ function wp_style_is( $handle, $list = 'queue' ) {
                $wp_styles = new WP_Styles();
        }
 
                $wp_styles = new WP_Styles();
        }
 

-       $query = $wp_styles->query( $handle, $list );
-
-       if ( is_object( $query ) )
-               return true;
-
-       return $query;
+       return (bool) $wp_styles->query( $handle, $list );

 }
 }