diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
commit | 767c3538b9f4aa2684429a7efea8f7728034c754 (patch) | |
tree | 8cc7b4bc82bfc8e5cc2179b7a8aa7b4f9a2be193 /wp-includes/vars.php | |
parent | 23c0a299ada091cdeece968ad5cd3bdd20f5ef3c (diff) | |
download | wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.gz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.xz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.zip |
WP Merge to rev 4347
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/vars.php')
-rw-r--r-- | wp-includes/vars.php | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 62253c1..82c7b10 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -43,7 +43,7 @@ if (!isset($wpsmiliestrans)) { ':arrow:' => 'icon_arrow.gif', ':shock:' => 'icon_eek.gif', ':smile:' => 'icon_smile.gif', - ' :???:' => 'icon_confused.gif', + ':???:' => 'icon_confused.gif', ':cool:' => 'icon_cool.gif', ':evil:' => 'icon_evil.gif', ':grin:' => 'icon_biggrin.gif', @@ -57,28 +57,28 @@ if (!isset($wpsmiliestrans)) { ':lol:' => 'icon_lol.gif', ':mad:' => 'icon_mad.gif', ':sad:' => 'icon_sad.gif', - ' 8-)' => 'icon_cool.gif', - ' 8-O' => 'icon_eek.gif', - ' :-(' => 'icon_sad.gif', - ' :-)' => 'icon_smile.gif', - ' :-?' => 'icon_confused.gif', - ' :-D' => 'icon_biggrin.gif', - ' :-P' => 'icon_razz.gif', - ' :-o' => 'icon_surprised.gif', - ' :-x' => 'icon_mad.gif', - ' :-|' => 'icon_neutral.gif', - ' ;-)' => 'icon_wink.gif', - ' 8)' => 'icon_cool.gif', - ' 8O' => 'icon_eek.gif', - ' :(' => 'icon_sad.gif', - ' :)' => 'icon_smile.gif', - ' :?' => 'icon_confused.gif', - ' :D' => 'icon_biggrin.gif', - ' :P' => 'icon_razz.gif', - ' :o' => 'icon_surprised.gif', - ' :x' => 'icon_mad.gif', - ' :|' => 'icon_neutral.gif', - ' ;)' => 'icon_wink.gif', + '8-)' => 'icon_cool.gif', + '8-O' => 'icon_eek.gif', + ':-(' => 'icon_sad.gif', + ':-)' => 'icon_smile.gif', + ':-?' => 'icon_confused.gif', + ':-D' => 'icon_biggrin.gif', + ':-P' => 'icon_razz.gif', + ':-o' => 'icon_surprised.gif', + ':-x' => 'icon_mad.gif', + ':-|' => 'icon_neutral.gif', + ';-)' => 'icon_wink.gif', + '8)' => 'icon_cool.gif', + '8O' => 'icon_eek.gif', + ':(' => 'icon_sad.gif', + ':)' => 'icon_smile.gif', + ':?' => 'icon_confused.gif', + ':D' => 'icon_biggrin.gif', + ':P' => 'icon_razz.gif', + ':o' => 'icon_surprised.gif', + ':x' => 'icon_mad.gif', + ':|' => 'icon_neutral.gif', + ';)' => 'icon_wink.gif', ':!:' => 'icon_exclaim.gif', ':?:' => 'icon_question.gif', ); @@ -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' /> "; } |