Ticket #12292: 12292.2.diff
File 12292.2.diff, 2.7 KB (added by , 15 years ago) |
---|
-
class.wp-styles.php
68 68 69 69 $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle ); 70 70 if ( 'rtl' === $this->text_direction && isset($this->registered[$handle]->extra['rtl']) && $this->registered[$handle]->extra['rtl'] ) { 71 if ( is_bool( $this->registered[$handle]->extra['rtl'] ) ) 72 $rtl_href = str_replace( '.css', '-rtl.css', $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" )); 73 else 71 if ( is_bool( $this->registered[$handle]->extra['rtl'] ) ) { 72 $suffix = isset( $this->registered[$handle]->extra['suffix'] ) ? $this->registered[$handle]->extra['suffix'] : ''; 73 $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" )); 74 } else { 74 75 $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" ); 76 } 75 77 76 78 $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle ); 77 79 } -
script-loader.php
424 424 $styles->default_dirs = array('/wp-admin/'); 425 425 426 426 $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; 427 // Any stylesheets that don't have a .dev version for ltr or rtl 428 $no_suffix = array( 'farbtastic' ); 427 429 428 430 $rtl_styles = array( 'wp-admin', 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); 429 431 … … 432 434 433 435 $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100217' ); 434 436 435 $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20100108' );437 $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20100108' ); 436 438 $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); 437 439 438 440 // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. … … 460 462 $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); 461 463 $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); 462 464 463 foreach ( $rtl_styles as $rtl_style ) 465 foreach ( $rtl_styles as $rtl_style ) { 464 466 $styles->add_data( $rtl_style, 'rtl', true ); 467 if ( $suffix && ! in_array( $rtl_style, $no_suffix ) ) 468 $styles->add_data( $rtl_style, 'suffix', $suffix ); 469 } 465 470 } 466 471 467 472 /**