From bbe2301960c570241ffa1f75a8b2d6f2f2e223c6 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 25 May 2015 16:35:24 +0000 Subject: [PATCH] Cleanup the use of `$wp_styles` global in `functions.wp-styles.php`. See #32444. Built from https://develop.svn.wordpress.org/trunk@32597 git-svn-id: http://core.svn.wordpress.org/trunk@32567 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.wp-styles.php | 5 +---- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php index 8e38ce2ba0..bfc12ca973 100644 --- a/wp-includes/functions.wp-styles.php +++ b/wp-includes/functions.wp-styles.php @@ -61,7 +61,7 @@ function wp_print_styles( $handles = false ) { } } - return wp_styles()->do_items( $handles ); + return $wp_styles->do_items( $handles ); } /** @@ -152,7 +152,6 @@ function wp_deregister_style( $handle ) { * 'screen', 'tty', or 'tv'. */ function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) { - global $wp_styles; _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); $wp_styles = wp_styles(); @@ -182,8 +181,6 @@ function wp_dequeue_style( $handle ) { /** * Check whether a CSS stylesheet has been added to the queue. * - * @global WP_Styles $wp_styles The WP_Styles object for printing styles. - * * @since 2.8.0 * * @param string $handle Name of the stylesheet. diff --git a/wp-includes/version.php b/wp-includes/version.php index 5c56636926..515fbf874f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32596'; +$wp_version = '4.3-alpha-32597'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.