Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 06:45:07 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup the use of $wp_styles global in functions.wp-styles.php.

Browse Source 
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
This commit is contained in:
Scott Taylor 2015-05-25 16:35:24 +00:00
parent ebd7fe8a2f
commit bbe2301960
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.wp-styles.php
View File

@ -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'. * 'screen', 'tty', or 'tv'.
*/ */
function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) { function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
global $wp_styles;
_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
$wp_styles = wp_styles(); $wp_styles = wp_styles();
@ -182,8 +181,6 @@ function wp_dequeue_style( $handle ) {
/** /**
* Check whether a CSS stylesheet has been added to the queue. * 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 * @since 2.8.0
* *
* @param string $handle Name of the stylesheet. * @param string $handle Name of the stylesheet.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.