From d699ce8b1315912cb3fb1aede9d3fadf7aec397a Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Sat, 3 Jan 2015 04:09:12 +0000
Subject: [PATCH] Ensure that inline styles attached to conditional stylesheets
 are also conditional.

Adds unit test.

Props georgestephanis.
Fixes #29180.


git-svn-id: https://develop.svn.wordpress.org/trunk@31031 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class.wp-styles.php         | 13 ++++++++---
 tests/phpunit/tests/dependencies/styles.php | 25 +++++++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/class.wp-styles.php b/src/wp-includes/class.wp-styles.php
index eb160670ca..46cb913bd3 100644
--- a/src/wp-includes/class.wp-styles.php
+++ b/src/wp-includes/class.wp-styles.php
@@ -107,17 +107,24 @@ class WP_Styles extends WP_Dependencies {
 			}
 		}
 
-		if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
-			$tag = "<!--[if {$obj->extra['conditional']}]>\n" . $tag . "<![endif]-->\n";
+		$conditional_pre = $conditional_post = '';
+		if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+			$conditional_pre  = "<!--[if {$obj->extra['conditional']}]>\n";
+			$conditional_post = "<![endif]-->\n";
 		}
 
 		if ( $this->do_concat ) {
+			$this->print_html .= $conditional_pre;
 			$this->print_html .= $tag;
-			if ( $inline_style = $this->print_inline_style( $handle, false ) )
+			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
 				$this->print_html .= sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+			}
+			$this->print_html .= $conditional_post;
 		} else {
+			echo $conditional_pre;
 			echo $tag;
 			$this->print_inline_style( $handle );
+			echo $conditional_post;
 		}
 
 		return true;
diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index b576b20371..6788d8af9f 100644
--- a/tests/phpunit/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
@@ -96,7 +96,7 @@ class Tests_Dependencies_Styles extends WP_UnitTestCase {
 		$style  = ".thing {\n";
 		$style .= "\tbackground: red;\n";
 		$style .= "}";
-		
+
 		$expected  = "<link rel='stylesheet' id='handle-css'  href='http://example.com?ver=1' type='text/css' media='all' />\n";
 		$expected .= "<style id='handle-inline-css' type='text/css'>\n";
 		$expected .= "$style\n";
@@ -147,7 +147,7 @@ class Tests_Dependencies_Styles extends WP_UnitTestCase {
 		$style1  = ".thing1 {\n";
 		$style1 .= "\tbackground: red;\n";
 		$style1 .= "}";
-		
+
 		$style2  = ".thing2 {\n";
 		$style2 .= "\tbackground: blue;\n";
 		$style2 .= "}";
@@ -206,4 +206,25 @@ class Tests_Dependencies_Styles extends WP_UnitTestCase {
 
 	}
 
+	/**
+	 * Test to make sure that inline styles attached to conditional
+	 * stylesheets are also conditional.
+	 */
+	public function test_conditional_inline_styles_are_also_conditional() {
+		$expected = <<<CSS
+<!--[if IE]>
+<link rel='stylesheet' id='handle-css'  href='http://example.com?ver=1' type='text/css' media='all' />
+<style id='handle-inline-css' type='text/css'>
+a { color: blue; }
+</style>
+<![endif]-->
+
+CSS;
+		wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
+		wp_style_add_data( 'handle', 'conditional', 'IE' );
+		wp_add_inline_style( 'handle', 'a { color: blue; }' );
+
+		$this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
+	}
+
 }