WordPress 3.8.1

[autoinstalls/wordpress.git] / wp-includes / class.wp-styles.php

diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 6455fe47375dc3de1a0c63670cb74e72239b829e..874e1a48d8b24d600939fe0f1563077383f0df56 100644 (file)
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -50,7 +50,7 @@ class WP_Styles extends WP_Dependencies {
                                $this->concat .= "$handle,";
                                $this->concat_version .= "$handle$ver";
 
-                               $this->print_code .= $this->get_data( $handle, 'after' );
+                               $this->print_code .= $this->print_inline_style( $handle, false );
 
                                return true;
                        }
@@ -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 .= "<!--[if {$obj->extra['conditional']}]>\n";
-                       $end_cond = "<![endif]-->\n";
-               }
-
-               $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle );
+               $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'] ) ) {
+                       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', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle );
+                       $rtl_tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\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 = "<!--[if {$obj->extra['conditional']}]>\n" . $tag . "<![endif]-->\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( "<style type='text/css'>\n%s\n</style>\n", $inline_style );
                } else {
                        echo $tag;
                        $this->print_inline_style( $handle );
@@ -135,7 +138,7 @@ class WP_Styles extends WP_Dependencies {
        }
 
        function _css_href( $src, $ver, $handle ) {
-               if ( !is_bool($src) && !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+               if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
                        $src = $this->base_url . $src;
                }
 
@@ -168,4 +171,3 @@ class WP_Styles extends WP_Dependencies {
                $this->print_html = '';
        }
 }
-