WP Merge to rev 5032

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

4 files changed, 67 insertions, 58 deletions

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index bde7bad..a02ae05 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -168,4 +168,5 @@ add_action('do_robots', 'do_robots');
 add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
 add_action('admin_print_scripts', 'wp_print_scripts', 20);
 add_action('mce_options', '_mce_set_direction');
+add_action('init', 'smilies_init', 5);
 ?>
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 29437a5..0cb1eed 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1396,4 +1396,68 @@ function _mce_add_direction_buttons($input) {
 
 	return $input;
 }
+
+function smilies_init() {
+	global $wpsmiliestrans, $wp_smiliessearch, $wp_smiliesreplace;
+
+	// don't bother setting up smilies if they are disabled
+	if ( !get_option('use_smilies') )
+		return;
+
+	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',
+		);
+	}
+
+	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' /> ";
+	}
+}
+
 ?>
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 810ad31..ab7c49c 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -804,10 +804,11 @@ function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
 
 	if ($add_cats) {
 		foreach ($add_cats as $new_cat) {
+			$new_cat = (int) $new_cat;
 			if ( !empty($new_cat) )
 				$wpdb->query("
 					INSERT INTO $wpdb->post2cat (post_id, category_id) 
-					VALUES ($post_ID, $new_cat)");
+					VALUES ('$post_ID', '$new_cat')");
 		}
 	}
 
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' /> ";
-}
-
 ?>