WordPress.org

Make WordPress Core

Changeset 4380


Ignore:
Timestamp:
10/12/2006 10:14:14 AM (12 years ago)
Author:
markjaquith
Message:

Somewhat stricter smilies replacements by Nazgul. fixes #3222

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/formatting.php

    r4360 r4380  
    619619        // HTML loop taken from texturize function, could possible be consolidated
    620620        $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
    621         $output = implode('', preg_replace($wp_smiliessearch, $wp_smiliesreplace, $textarr));
     621        $stop = count($textarr);// loop stuff
     622        for ($i = 0; $i < $stop; $i++) {
     623            $content = $textarr[$i];
     624            if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag
     625                $content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
     626            }
     627            $output .= $content;
     628        }
    622629    } else {
    623630        // return default text.
  • trunk/wp-includes/vars.php

    r4360 r4380  
    8888// generates smilies' search & replace arrays
    8989foreach($wpsmiliestrans as $smiley => $img) {
    90     $wp_smiliessearch[] = '/(\s|^|[^<])?'.preg_quote($smiley, '/').'(\b|\s|$)/';
     90    $wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\s|$)/';
    9191    $smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
    9292    $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
Note: See TracChangeset for help on using the changeset viewer.