Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-08 16:41:44 +01:00
Code Issues Projects Releases Wiki Activity

Styles: Pass the media attribute as an argument to the style_loader_tag filter.

Browse Source 
Props sebastian.pisula.
Fixes #34765.
Built from https://develop.svn.wordpress.org/trunk@36592


git-svn-id: http://core.svn.wordpress.org/trunk@36559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-02-19 21:05:26 +00:00
parent 0285fd946d
commit a04b869652
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

@ -98,12 +98,14 @@ class WP_Styles extends WP_Dependencies {
* *
* @since 2.6.0 * @since 2.6.0
* @since 4.3.0 Introduced the `$href` parameter. * @since 4.3.0 Introduced the `$href` parameter.
* @since 4.5.0 Introduced the `$media` parameter.
* *
* @param string $html 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. * @param string $href The stylesheet's source URL.
* @param string $media The stylesheet's media attribute.
*/ */
$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href ); $tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
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'] : '';
@ -113,7 +115,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_href ); $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, $media );
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.5-alpha-36591'; $wp_version = '4.5-alpha-36592';
/** /**
* 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.