Changeset 27111

Timestamp:

02/06/2014 10:15:25 PM (11 years ago)

Author:

nacin

Message:

Fix the conditional enqueueing/printing of colors stylesheets, without breaking dependencies.

fixes #18380.
see #20729 which should properly fix this.

Location:

trunk/src

Files:

• wp-admin/js/user-profile.js (modified) (1 diff)
• wp-includes/class.wp-styles.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/js/user-profile.js

@@ -96 +96 @@
             // Set color scheme
             if ( user_id === current_user_id ) {
-                // Load the colors stylesheet
+                // Load the colors stylesheet.
+                // The default color scheme won't have one, so we'll need to create an element.
+                if ( 0 === $stylesheet.length ) {
+                    $stylesheet = $( '<link rel="stylesheet" />' ).appendTo( 'head' );
+                }
                 $stylesheet.attr( 'href', $this.children( '.css_url' ).val() );
 

trunk/src/wp-includes/class.wp-styles.php

@@ -63 +63 @@
 
         $href = $this->_css_href( $obj->src, $ver, $handle );
+        if ( empty( $href ) ) {
+            // Turns out there is nothing to print.
+            return true;
+        }
         $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
         $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';

trunk/src/wp-includes/general-template.php

@@ -2104 +2104 @@
 
     wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
-        admin_url( "css/colors$suffix.css" ),
+        false,
         array( '#222', '#333', '#0074a2', '#2ea2cc' ),
         array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' )

trunk/src/wp-includes/script-loader.php

@@ -588 +588 @@
 
     // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
+
     $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
 
@@ -696 +697 @@
         $url = $color->url;
 
+        if ( ! $url ) {
+            return false;
+        }
+
         if ( isset($parsed['query']) && $parsed['query'] ) {
             wp_parse_str( $parsed['query'], $qv );

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.9-alpha-src';
+$wp_version = '3.9-alpha-27111-src';
 
 /**