WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass stylesheet URL as an argument to 'style_loader_tag' filter. 

This change brings the filter's signature in line with 'script_loader_tag'.

Props nicholas_io.
Fixes #32660.
Built from https://develop.svn.wordpress.org/trunk@32898


git-svn-id: http://core.svn.wordpress.org/trunk@32869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-06-21 19:35:26 +00:00
parent 4423739c65
commit a680859400
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class.wp-styles.php
View File

@ -84,11 +84,13 @@ class WP_Styles extends WP_Dependencies {
* Filter the HTML link tag of an enqueued style. * Filter the HTML link tag of an enqueued style.
* *
* @since 2.6.0 * @since 2.6.0
* @since 4.3.0 Introduced the `$href` parameter.
* *
* @param string The link tag for the enqueued style. * @param string 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 ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) { if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : ''; $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' ) { if ( $obj->extra['rtl'] === 'replace' ) {
$tag = $rtl_tag; $tag = $rtl_tag;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32897'; $wp_version = '4.3-alpha-32898';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.