Changeset 31031

Timestamp:

01/03/2015 04:09:12 AM (10 years ago)

Author:

wonderboymusic

Message:

Ensure that inline styles attached to conditional stylesheets are also conditional.

Adds unit test.

Props georgestephanis.
Fixes #29180.

Location:

trunk

Files:

• src/wp-includes/class.wp-styles.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/styles.php (modified) (3 diffs)

trunk/src/wp-includes/class.wp-styles.php

@@ -108 +108 @@
         }
 
-        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;
         }
 

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -97 +97 @@
         $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";
@@ -148 +148 @@
         $style1 .= "\tbackground: red;\n";
         $style1 .= "}";
-        
+
         $style2  = ".thing2 {\n";
         $style2 .= "\tbackground: blue;\n";
@@ -207 +207 @@
     }
 
+    /**
+     * 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' ) );
+    }
+
 }