Changeset 31031 for trunk/src/wp-includes/class.wp-styles.php

Timestamp:

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

Author:

wonderboymusic

Message:

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

Adds unit test.

Props georgestephanis.
Fixes #29180.

File:

• trunk/src/wp-includes/class.wp-styles.php (modified) (1 diff)

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;
                 }