WP Merge to rev 5032

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@916 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 0 insertions, 57 deletions

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 26f0fa0..7292f6d 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -35,61 +35,4 @@ $is_IE = ( $is_macIE || $is_winIE );
 $is_apache = ((strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) || (strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false)) ? true : false;
 $is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? true : false;
 
-// if the config file does not provide the smilies array, let's define it here
-if (!isset($wpsmiliestrans)) {
-	$wpsmiliestrans = array(
-	':mrgreen:' => 'icon_mrgreen.gif',
-	':neutral:' => 'icon_neutral.gif',
-	':twisted:' => 'icon_twisted.gif',
-	  ':arrow:' => 'icon_arrow.gif',
-	  ':shock:' => 'icon_eek.gif',
-	  ':smile:' => 'icon_smile.gif',
-	    ':???:' => 'icon_confused.gif',
-	   ':cool:' => 'icon_cool.gif',
-	   ':evil:' => 'icon_evil.gif',
-	   ':grin:' => 'icon_biggrin.gif',
-	   ':idea:' => 'icon_idea.gif',
-	   ':oops:' => 'icon_redface.gif',
-	   ':razz:' => 'icon_razz.gif',
-	   ':roll:' => 'icon_rolleyes.gif',
-	   ':wink:' => 'icon_wink.gif',
-	    ':cry:' => 'icon_cry.gif',
-	    ':eek:' => 'icon_surprised.gif',
-	    ':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',
-	      ':!:' => 'icon_exclaim.gif',
-	      ':?:' => 'icon_question.gif',
-	);
-}
-
-// generates smilies' search & replace arrays
-foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
-	$wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\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' /> ";
-}
-
 ?>