git-svn-id: http://svn.automattic.com/wordpress/trunk@4283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
550956ddf2
commit
8567d57da9
|
@ -613,7 +613,7 @@ function convert_smilies($text) {
|
|||
for ($i = 0; $i < $stop; $i++) {
|
||||
$content = $textarr[$i];
|
||||
if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag
|
||||
$content = str_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
|
||||
$content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
|
||||
}
|
||||
$output .= $content;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ if (!isset($wpsmiliestrans)) {
|
|||
|
||||
// generates smilies' search & replace arrays
|
||||
foreach($wpsmiliestrans as $smiley => $img) {
|
||||
$wp_smiliessearch[] = $smiley;
|
||||
$wp_smiliessearch[] = '/(\s|^)?'.preg_quote($smiley, '/').'(\b|\s)/';
|
||||
$smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
|
||||
$wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue