diff --git a/wp-admin/bookmarklet.php b/wp-admin/bookmarklet.php
index 1f06d57a2d..1883bd7200 100644
--- a/wp-admin/bookmarklet.php
+++ b/wp-admin/bookmarklet.php
@@ -20,34 +20,20 @@ window.close()
 </html>
 <?php
 } else {
-    $popuptitle = wp_specialchars(stripslashes($popuptitle));
-    $text = wp_specialchars(stripslashes(urldecode($text)));
-    
-    /* big funky fixes for browsers' javascript bugs */
-    
-    if (($is_macIE) && (!isset($IEMac_bookmarklet_fix))) {
-        $popuptitle = preg_replace('/'.$wp_macIE_correction["in"].'/','/'.$wp_macIE_correction["out"].'/',$popuptitle);
-        $text = preg_replace('/'.$wp_macIE_correction["in"].'/','/'.$wp_macIE_correction["out"].'/',$text);
-    }
-    
-    if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
-        $popuptitle =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $popuptitle);
-        $text =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $text);
-    }
-    
-    if (($is_gecko) && (!isset($Gecko_bookmarklet_fix))) {
-        $popuptitle = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$popuptitle);
-        $text = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$text);
-    }
-    
-    $post_title = wp_specialchars($_REQUEST['post_title']);
-    if (!empty($post_title)) {
-        $post_title =  stripslashes($post_title);
-    } else {
-        $post_title = $popuptitle;
-    }
-
-    $edited_post_title = wp_specialchars($post_title);
+	$popuptitle = wp_specialchars(stripslashes($popuptitle));
+	$text       = wp_specialchars(stripslashes(urldecode($text)));
+	
+	$popuptitle = funky_javascript_fix($popuptitle);
+	$text       = funky_javascript_fix($text);
+	
+	$post_title = wp_specialchars($_REQUEST['post_title']);
+	if (!empty($post_title)) {
+		$post_title =  stripslashes($post_title);
+	} else {
+		$post_title = $popuptitle;
+	}
+	
+	$edited_post_title = wp_specialchars($post_title);
 
 // $post_pingback needs to be set in any file that includes edit-form.php
     $post_pingback = get_settings('default_pingback_flag');
diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index ff0da469ca..5ec487dcaa 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -236,7 +236,41 @@ function sanitize_title_with_dashes($title) {
 }
 
 function convert_chars($content, $flag = 'obsolete') { 
-	global $wp_htmltranswinuni;
+	// Translation of invalid Unicode references range to valid range
+	$wp_htmltranswinuni = array(
+	'&#128;' => '&#8364;', // the Euro sign
+	'&#129;' => '',
+	'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
+	'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
+	'&#132;' => '&#8222;',
+	'&#133;' => '&#8230;',
+	'&#134;' => '&#8224;',
+	'&#135;' => '&#8225;',
+	'&#136;' => '&#710;',
+	'&#137;' => '&#8240;',
+	'&#138;' => '&#352;',
+	'&#139;' => '&#8249;',
+	'&#140;' => '&#338;',
+	'&#141;' => '',
+	'&#142;' => '&#382;',
+	'&#143;' => '',
+	'&#144;' => '',
+	'&#145;' => '&#8216;',
+	'&#146;' => '&#8217;',
+	'&#147;' => '&#8220;',
+	'&#148;' => '&#8221;',
+	'&#149;' => '&#8226;',
+	'&#150;' => '&#8211;',
+	'&#151;' => '&#8212;',
+	'&#152;' => '&#732;',
+	'&#153;' => '&#8482;',
+	'&#154;' => '&#353;',
+	'&#155;' => '&#8250;',
+	'&#156;' => '&#339;',
+	'&#157;' => '',
+	'&#158;' => '',
+	'&#159;' => '&#376;'
+	);
 
 	// Remove metadata tags
 	$content = preg_replace('/<title>(.+?)<\/title>/','',$content);
@@ -255,6 +289,49 @@ function convert_chars($content, $flag = 'obsolete') {
 	return $content;
 }
 
+function funky_javascript_fix($text) {
+	// Fixes for browsers' javascript bugs
+	global $is_macIE, $is_winIE, $is_gecko;
+	$wp_macIE_correction['in'] = array(
+		'/\%uFFD4/', '/\%uFFD5/', '/\%uFFD2/', '/\%uFFD3/',
+		'/\%uFFA5/', '/\%uFFD0/', '/\%uFFD1/', '/\%uFFBD/',
+		'/\%uFF83%uFFC0/', '/\%uFF83%uFFC1/', '/\%uFF83%uFFC6/', '/\%uFF83%uFFC9/',
+		'/\%uFFB9/', '/\%uFF81%uFF8C/', '/\%uFF81%uFF8D/', '/\%uFF81%uFFDA/',
+		'/\%uFFDB/'
+	);
+	$wp_macIE_correction['out'] = array(
+		'&lsquo;', '&rsquo;', '&ldquo;', '&rdquo;',
+		'&bull;', '&ndash;', '&mdash;', '&Omega;',
+		'&beta;', '&gamma;', '&theta;', '&lambda;',
+		'&pi;', '&prime;', '&Prime;', '&ang;',
+		'&euro;'
+	);
+	$wp_gecko_correction['in'] = array(
+		'/\�/', '/\�/', '/\�/', '/\�/',
+		'/\�/', '/\�/', '/\�/', '/\O/',
+		'/\�/', '/\?/', '/\?/', '/\?/',
+		'/\p/', '/\'/', '/\?/', '/\/',
+		'/\�/', '/\?/'
+	);
+	$wp_gecko_correction['out'] = array(
+		'&8216;', '&rsquo;', '&ldquo;', '&rdquo;',
+		'&bull;', '&ndash;', '&mdash;', '&Omega;',
+		'&beta;', '&gamma;', '&theta;', '&lambda;',
+		'&pi;', '&prime;', '&Prime;', '&ang;',
+		'&euro;', '&#8201;'
+	);
+	if ( $is_macIE )
+		$text = preg_replace('/'.$wp_macIE_correction["in"].'/', '/'.$wp_macIE_correction["out"].'/', $text);
+	
+	if ( $is_winIE )
+		$text =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $text);
+	
+	if ( $is_gecko )
+		$text = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$text);
+	
+	return $text;
+}
+
 /*
  balanceTags
  
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index e298c12d05..970b4a8dde 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -3,42 +3,6 @@
 /* This file sets various arrays and variables for use in WordPress */
 require(ABSPATH . 'wp-includes/version.php');
 
-# Translation of invalid Unicode references range to valid range
-$wp_htmltranswinuni = array(
-	'&#128;' => '&#8364;', // the Euro sign
-	'&#129;' => '',
-	'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
-	'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
-	'&#132;' => '&#8222;',
-	'&#133;' => '&#8230;',
-	'&#134;' => '&#8224;',
-	'&#135;' => '&#8225;',
-	'&#136;' => '&#710;',
-	'&#137;' => '&#8240;',
-	'&#138;' => '&#352;',
-	'&#139;' => '&#8249;',
-	'&#140;' => '&#338;',
-	'&#141;' => '',
-	'&#142;' => '&#382;',
-	'&#143;' => '',
-	'&#144;' => '',
-	'&#145;' => '&#8216;',
-	'&#146;' => '&#8217;',
-	'&#147;' => '&#8220;',
-	'&#148;' => '&#8221;',
-	'&#149;' => '&#8226;',
-	'&#150;' => '&#8211;',
-	'&#151;' => '&#8212;',
-	'&#152;' => '&#732;',
-	'&#153;' => '&#8482;',
-	'&#154;' => '&#353;',
-	'&#155;' => '&#8250;',
-	'&#156;' => '&#339;',
-	'&#157;' => '',
-	'&#158;' => '',
-	'&#159;' => '&#376;'
-	);
-
 // On which page are we ?
 $PHP_SELF = $_SERVER['PHP_SELF'];
 if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
@@ -75,36 +39,6 @@ if (preg_match('/Lynx/', $HTTP_USER_AGENT)) {
 }
 $is_IE    = (($is_macIE) || ($is_winIE));
 
-// browser-specific javascript corrections
-$wp_macIE_correction['in'] = array(
-	'/\%uFFD4/', '/\%uFFD5/', '/\%uFFD2/', '/\%uFFD3/',
-	'/\%uFFA5/', '/\%uFFD0/', '/\%uFFD1/', '/\%uFFBD/',
-	'/\%uFF83%uFFC0/', '/\%uFF83%uFFC1/', '/\%uFF83%uFFC6/', '/\%uFF83%uFFC9/',
-	'/\%uFFB9/', '/\%uFF81%uFF8C/', '/\%uFF81%uFF8D/', '/\%uFF81%uFFDA/',
-	'/\%uFFDB/'
-);
-$wp_macIE_correction['out'] = array(
-	'&lsquo;', '&rsquo;', '&ldquo;', '&rdquo;',
-	'&bull;', '&ndash;', '&mdash;', '&Omega;',
-	'&beta;', '&gamma;', '&theta;', '&lambda;',
-	'&pi;', '&prime;', '&Prime;', '&ang;',
-	'&euro;'
-);
-$wp_gecko_correction['in'] = array(
-	'/\‘/', '/\’/', '/\“/', '/\”/',
-	'/\•/', '/\–/', '/\—/', '/\Ω/',
-	'/\β/', '/\γ/', '/\θ/', '/\λ/',
-	'/\π/', '/\′/', '/\″/', '/\/',
-	'/\€/', '/\ /'
-);
-$wp_gecko_correction['out'] = array(
-	'&8216;', '&rsquo;', '&ldquo;', '&rdquo;',
-	'&bull;', '&ndash;', '&mdash;', '&Omega;',
-	'&beta;', '&gamma;', '&theta;', '&lambda;',
-	'&pi;', '&prime;', '&Prime;', '&ang;',
-	'&euro;', '&#8201;'
-);
-
 // Server detection
 $is_apache = strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') ? 1 : 0;