Index: wordpress/wp-includes/formatting.php
===================================================================
--- wordpress/wp-includes/formatting.php	(revision 16195)
+++ wordpress/wp-includes/formatting.php	(working copy)
@@ -56,8 +56,8 @@
 		$static_characters = array_merge(array('---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)'), $cockney);
 		$static_replacements = array_merge(array('—', ' — ', '–', ' – ', 'xn--', '…', $opening_quote, $closing_quote, ' ™'), $cockneyreplace);
 
-		$dynamic_characters = array('/\'(\d\d(?:&#8217;|\')?s)/', '/\'(\d)/', '/(\s|\A|[([{<]|")\'/', '/(\d)"/', '/(\d)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{<])"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
-		$dynamic_replacements = array('&#8217;$1','&#8217;$1', '$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '&#8217;$1', '$1&#215;$2');
+		$dynamic_characters = array('/\'(\d)/', '/\'(\d\d(?:&#8217;|\')?s)/', '/(\s|\A|[([{<]|")\'/', '/(\S)\'([^\'\s])/', '/\'([\s.]|\Z)/', '/(\d)"/', '/(\d)\'/', '/(\s|\A|[([{<])"(?!\s)/', '/"(\s|\S|\Z)/', '/\b(\d+)x(\d+)\b/');
+		$dynamic_replacements = array('&#8217;$1', '&#8217;$1', '$1&#8216;', '$1&#8217;$2', '&#8217;$1', '$1&#8243;', '$1&#8242;', '$1' . $opening_quote . '$2', $closing_quote . '$1', '$1&#215;$2');
 
 		$static_setup = true;
 	}
Index: wp-testcase/test_includes_formatting.php
===================================================================
--- wp-testcase/test_includes_formatting.php	(revision 315)
+++ wp-testcase/test_includes_formatting.php	(working copy)
@@ -403,9 +403,8 @@
 		$this->assertEquals('A test with a number, &#8220;like 62&#8221;, is nice to have.', wptexturize('A test with a number, "like 62", is nice to have.'));
 	}
 	
-	//WP Ticket #1258
+	//WP Ticket #4539
 	function test_quotes_before_s() {
-		$this->knownWPBug(4539);
 		$this->assertEquals('test&#8217;s', wptexturize("test's"));
 		$this->assertEquals('&#8216;test&#8217;s', wptexturize("'test's"));
 		$this->assertEquals('&#8216;test&#8217;s&#8217;', wptexturize("'test's'"));
@@ -415,7 +414,6 @@
 
 	//WP Ticket #4539
 	function test_quotes_before_numbers() {
-		$this->knownWPBug(4539);
 		$this->assertEquals('Class of &#8217;99', wptexturize("Class of '99"));
 		$this->assertEquals('&#8216;Class of &#8217;99&#8217;', wptexturize("'Class of '99'"));
 	}