Ticket #16448: 16448.diff

wp-includes/formatting.php

@@ -1475 +1475 @@
                 // HTML loop taken from texturize function, could possible be consolidated
                 $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
                 $stop = count($textarr);// loop stuff
+                
+                $tags_to_ignore = array('code', 'pre');
+                $inside_ignore_block = ''; 
+                
                 for ($i = 0; $i < $stop; $i++) {
                         $content = $textarr[$i];
-                        if ((strlen($content) > 0) && ('<' != $content[0])) { // If it's not a tag
+                        
+                        // If we're in an ignore block, wait until we find its closing tag 
+                        if( ! $inside_ignore_block && preg_match( '/^<(' . implode( '|', $tags_to_ignore ) . ')>/', $content, $matches ) ) 
+                                $inside_ignore_block = $matches[1]; 
+                                         
+                        if ( ! $inside_ignore_block && ( strlen($content) > 0 ) && ( '<' != $content[0] ) ) // If it's not a tag 
                                 $content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
-                        }
+                        
+                        if( $inside_ignore_block && ( '</' . $inside_ignore_block .'>' == $content ) ) 
+                                $inside_ignore_block = '';
+
                         $output .= $content;
                 }
         } else {