WordPress 3.9-scripts

[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..dbdc82984dc8c94a71df68f2638b7c64acc241e0 100644 (file)
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -29,6 +29,13 @@ class WP_Styles extends WP_Dependencies {
        var $default_dirs;
 
        function __construct() {
+               /**
+                * Fires when the WP_Styles instance is initialized.
+                *
+                * @since 2.6.0
+                *
+                * @param WP_Styles &$this WP_Styles instance, passed by reference.
+                */
                do_action_ref_array( 'wp_default_styles', array(&$this) );
        }
 
@@ -50,7 +57,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;
                        }
@@ -62,32 +69,55 @@ class WP_Styles extends WP_Dependencies {
                        $media = 'all';
 
                $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'] ) . "'" : '';
 
-               $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 );
+               /**
+                * Filter the HTML link tag of an enqueued style.
+                *
+                * @since 2.6.0
+                *
+                * @param string         The link tag for the enqueued style.
+                * @param string $handle The style's registered 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 );
+                       /**
+                        * Filter the right-to-left (RTL) HTML link tag of an enqueued style.
+                        *
+                        * @since 2.6.0
+                        *
+                        * @param string $rtl_style The right to left link tag for the enqueued style.
+                        * @param string $handle    The style's registered 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 );
@@ -129,18 +159,35 @@ class WP_Styles extends WP_Dependencies {
 
        function all_deps( $handles, $recursion = false, $group = false ) {
                $r = parent::all_deps( $handles, $recursion );
-               if ( !$recursion )
+               if ( !$recursion ) {
+                       /**
+                        * Filter the array of enqueued styles before processing for output.
+                        *
+                        * @since 2.6.0
+                        *
+                        * @param array $to_do The list of enqueued styles about to be processed.
+                        */
                        $this->to_do = apply_filters( 'print_styles_array', $this->to_do );
+               }
                return $r;
        }
 
        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;
                }
 
                if ( !empty($ver) )
                        $src = add_query_arg('ver', $ver, $src);
+
+               /**
+                * Filter an enqueued style's fully-qualified URL.
+                *
+                * @since 2.6.0
+                *
+                * @param string $src    The source URL of the enqueued style.
+                * @param string $handle The style's registered handle.
+                */
                $src = apply_filters( 'style_loader_src', $src, $handle );
                return esc_url( $src );
        }
@@ -168,4 +215,3 @@ class WP_Styles extends WP_Dependencies {
                $this->print_html = '';
        }
 }
-