WordPress 4.3

[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 46cb913bd3541ecfa8fd4a40cab4815f696a577c..e462f8c111a6c78788bc31e8d52e3ebaeeffb06f 100644 (file)
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -84,11 +84,13 @@ class WP_Styles extends WP_Dependencies {
                 * Filter the HTML link tag of an enqueued style.
                 *
                 * @since 2.6.0
                 * Filter the HTML link tag of an enqueued style.
                 *
                 * @since 2.6.0

+                * @since 4.3.0 Introduced the `$href` parameter.

                 *
                 *

-                * @param string         The link tag for the enqueued style.
+                * @param string $html   The link tag for the enqueued style.

                 * @param string $handle The style's registered handle.
                 * @param string $handle The style's registered handle.

+                * @param string $href   The stylesheet's source URL.

                 */
                 */

-               $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, $href );

                if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
                        if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
                                $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
                if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
                        if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
                                $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';


@@ -98,7 +100,7 @@ class WP_Styles extends WP_Dependencies {
                        }
 
                        /** This filter is documented in wp-includes/class.wp-styles.php */
                        }
 
                        /** This filter is documented in wp-includes/class.wp-styles.php */

-                       $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, $rtl_href );

 
                        if ( $obj->extra['rtl'] === 'replace' ) {
                                $tag = $rtl_tag;
 
                        if ( $obj->extra['rtl'] === 'replace' ) {
                                $tag = $rtl_tag;


@@ -234,11 +236,17 @@ class WP_Styles extends WP_Dependencies {
                return false;
        }
 
                return false;
        }
 

+       /**
+        * @return array
+        */

        public function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
                $this->do_items(false, 1);
                return $this->done;
        }
 
        public function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
                $this->do_items(false, 1);
                return $this->done;
        }
 

+       /**
+        * @access public
+        */

        public function reset() {
                $this->do_concat = false;
                $this->concat = '';
        public function reset() {
                $this->do_concat = false;
                $this->concat = '';