Changeset 26191 for trunk/src/wp-includes/formatting.php

Timestamp:

11/15/2013 02:45:39 AM (11 years ago)

Author:

wonderboymusic

Message:

Don't place smilies inside of pre or code tags. Don't skip smilie after a smilie with an 8 in it. Fix regular expression used for smiley translations to work when there is only one registered emoticon.

Props solarissmoke, soulseekah, mdbitz, yonasy. ht to mdbitz for the Unit Tests and a comprehensive patch.
Fixes #16448, #20124, #25303.

File:

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

trunk/src/wp-includes/formatting.php

@@ -1794 +1794 @@
  * @return string Converted content with text smilies replaced with images.
  */
-function convert_smilies($text) {
+function convert_smilies( $text ) {
     global $wp_smiliessearch;
     $output = '';
-    if ( get_option('use_smilies') && !empty($wp_smiliessearch) ) {
+    if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
         // 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
-        for ($i = 0; $i < $stop; $i++) {
+        $textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
+        $stop = count( $textarr );// loop stuff
+
+        // Ignore proessing of specific tags
+        $tags_to_ignore = 'code|pre|style|script|textarea';
+        $ignore_block_element = '';
+
+        for ( $i = 0; $i < $stop; $i++ ) {
             $content = $textarr[$i];
-            if ((strlen($content) > 0) && ('<' != $content[0])) { // If it's not a tag
-                $content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
+
+            // If we're in an ignore block, wait until we find its closing tag
+            if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+                $ignore_block_element = $matches[1];
             }
+
+            // If it's not a tag and not in ignore block
+            if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+                $content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
+            }
+
+            // did we exit ignore block
+            if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+                $ignore_block_element = '';
+            }
+
             $output .= $content;
         }