Changeset 27515

Timestamp:

03/12/2014 04:11:38 PM (12 years ago)

Author:

nacin

Message:

Revert [27203], restore JIT color scheme stylesheets. Restores [27111].

fixes #27175. see #20729.

Location:

trunk/src/wp-includes

Files:

• class.wp-styles.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)
• script-loader.php (modified) (3 diffs)

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/deprecated.php

@@ -3413 +3413 @@
 
 /**
- * Callback formerly fired on the style_loader_src hook. No longer needed.
- *
- * @since 2.6.0
- * @deprecated 3.9.0
- */
-function wp_style_loader_src() {}
-
-
-/**
  * Old callback for tag link tooltips.
  *

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

@@ -582 +582 @@
 
     // Register a stylesheet for the selected admin color scheme.
-    $colors_url = false;
-    if ( ! empty( $GLOBALS['_wp_admin_css_colors'] ) ) {
-        $color = get_user_option( 'admin_color' );
-        if ( ! $color || ! isset( $GLOBALS['_wp_admin_css_colors'][ $color ] ) ) {
-            $color = 'fresh';
-        }
-        $colors_url = $GLOBALS['_wp_admin_css_colors'][ $color ]->url;
-    }
-    $styles->add( 'colors', $colors_url, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
+    $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
 
     $suffix = SCRIPT_DEBUG ? '' : '.min';
@@ -690 +682 @@
 
 /**
+ * Administration Screen CSS for changing the styles.
+ *
+ * If installing the 'wp-admin/' directory will be replaced with './'.
+ *
+ * The $_wp_admin_css_colors global manages the Administration Screens CSS
+ * stylesheet that is loaded. The option that is set is 'admin_color' and is the
+ * color and key for the array. The value for the color key is an object with
+ * a 'url' parameter that has the URL path to the CSS file.
+ *
+ * The query from $src parameter will be appended to the URL that is given from
+ * the $_wp_admin_css_colors array value URL.
+ *
+ * @since 2.6.0
+ * @uses $_wp_admin_css_colors
+ *
+ * @param string $src Source URL.
+ * @param string $handle Either 'colors' or 'colors-rtl'.
+ * @return string URL path to CSS stylesheet for Administration Screens.
+ */
+function wp_style_loader_src( $src, $handle ) {
+    global $_wp_admin_css_colors;
+
+    if ( defined('WP_INSTALLING') )
+        return preg_replace( '#^wp-admin/#', './', $src );
+
+    if ( 'colors' == $handle ) {
+        $color = get_user_option('admin_color');
+
+        if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+            $color = 'fresh';
+
+        $color = $_wp_admin_css_colors[$color];
+        $parsed = parse_url( $src );
+        $url = $color->url;
+
+        if ( ! $url ) {
+            return false;
+        }
+
+        if ( isset($parsed['query']) && $parsed['query'] ) {
+            wp_parse_str( $parsed['query'], $qv );
+            $url = add_query_arg( $qv, $url );
+        }
+
+        return $url;
+    }
+
+    return $src;
+}
+
+/**
  * Prints the script queue in the HTML head on admin pages.
  *
@@ -935 +978 @@
 
 add_action( 'wp_default_styles', 'wp_default_styles' );
+add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );