X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..78ff9d91a14da1f53bd3f1ffcab1264d92359b72:/wp-includes/class.wp-styles.php
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index b1241b30..874e1a48 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -65,29 +65,32 @@ class WP_Styles extends WP_Dependencies {
$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
- $end_cond = $tag = '';
- if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
- $tag .= "\n";
- }
-
- $tag .= apply_filters( 'style_loader_tag', "\n", $handle );
+ $tag = apply_filters( 'style_loader_tag', "\n", $handle );
if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
- if ( is_bool( $obj->extra['rtl'] ) ) {
+ if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
} else {
$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
}
- $tag .= apply_filters( 'style_loader_tag', "\n", $handle );
+ $rtl_tag = apply_filters( 'style_loader_tag', "\n", $handle );
+
+ if ( $obj->extra['rtl'] === 'replace' ) {
+ $tag = $rtl_tag;
+ } else {
+ $tag .= $rtl_tag;
+ }
}
- $tag .= $end_cond;
+ if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
+ $tag = "\n";
+ }
if ( $this->do_concat ) {
$this->print_html .= $tag;
- $this->print_html .= $this->print_inline_style( $handle, false );
+ if ( $inline_style = $this->print_inline_style( $handle, false ) )
+ $this->print_html .= sprintf( "\n", $inline_style );
} else {
echo $tag;
$this->print_inline_style( $handle );