Ticket #26316: 26316.diff

src/wp-admin/includes/misc.php

@@ -583 +583 @@
                 <?php
 
                 foreach ( $_wp_admin_css_colors as $color => $color_info ) :
-
+                        $url = $color_info->url;
+                        $suffix = '.min.css';
+                        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+                                $url = preg_replace( '/.min.css$|.min.css(?=\?)/', '.css', $url );
+                                $suffix = '.css';
+                        }
+                        if ( is_rtl() ) {
+                                $url = str_replace( $suffix, '-rtl' . $suffix, $url );
+                        }
                         ?>
                         <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
                                 <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
-                                <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
+                                <input type="hidden" class="css_url" value="<?php echo esc_url( $url ); ?>" />
                                 <input type="hidden" class="icon_colors" value="<?php echo esc_attr( json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
                                 <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
                                 <table class="color-palette">

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

@@ -65 +65 @@
                 $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
                 $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
 
+if ( 'colors' === $handle ) var_dump( $obj, $href );
+
                 $tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle );
                 if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
                         if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
@@ -82 +84 @@
                                 $tag .= $rtl_tag;
                         }
                 }
-
+if ( 'colors' === $handle ) var_dump( $rtl_href );
                 if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
                         $tag = "<!--[if {$obj->extra['conditional']}]>\n" . $tag . "<![endif]-->\n";
                 }