Ticket #34575: shortcodes.php.diff

wp-includes/shortcodes.php

@@ -335 +335 @@
         $pattern = get_shortcode_regex();
         $textarr = wp_html_split( $content );
 
+        $escape_code = apply_filters('safe_shortcodes_in_html_comments_cdata', true);
+        
         foreach ( $textarr as &$element ) {
                 if ( '' == $element || '<' !== $element[0] ) {
                         continue;
@@ -351 +353 @@
                         continue;
                 }
 
-                if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
+                if ( $ignore_html ) {
                         // Encode all [ and ] chars.
                         $element = strtr( $element, $trans );
                         continue;
                 }
+                
+                if ( '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
+                        if ( $escape_code ) {
+                                $element = strtr( $element, $trans );
+                        }
+                        
+                        continue;
+                }
 
                 $attributes = wp_kses_attr_parse( $element );
                 if ( false === $attributes ) {