WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure color schemes are registered when WP_Styles is initialized early. 

fixes #27175. see #26669.

Built from https://develop.svn.wordpress.org/trunk@27228


git-svn-id: http://core.svn.wordpress.org/trunk@27085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-02-21 21:09:15 +00:00
parent 9cc9b023b4
commit 4e78f02a05
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/script-loader.php
View File

@ -578,6 +578,11 @@ function wp_default_styles( &$styles ) {
// Register a stylesheet for the selected admin color scheme. // Register a stylesheet for the selected admin color scheme.
$colors_url = false; $colors_url = false;
// It's possible this is run before admin_init, so we need to make sure color schemes are registered.
if ( is_admin() && empty( $GLOBALS['_wp_admin_css_colors'] ) && ! did_action( 'admin_init' ) && has_action( 'admin_init', 'register_admin_color_schemes' ) ) {
register_admin_color_schemes();
remove_action( 'admin_init', 'register_admin_color_schemes', 1 );
}
if ( ! empty( $GLOBALS['_wp_admin_css_colors'] ) ) { if ( ! empty( $GLOBALS['_wp_admin_css_colors'] ) ) {
$color = get_user_option( 'admin_color' ); $color = get_user_option( 'admin_color' );
if ( ! $color || ! isset( $GLOBALS['_wp_admin_css_colors'][ $color ] ) ) { if ( ! $color || ! isset( $GLOBALS['_wp_admin_css_colors'][ $color ] ) ) {