Index: wp-testcase/test_includes_formatting.php
===================================================================
--- wp-testcase/test_includes_formatting.php (revision 315)
+++ wp-testcase/test_includes_formatting.php (working copy)
@@ -386,26 +386,43 @@
$this->assertEquals('A dog (“Hubertus”) was sent out.', wptexturize('A dog ("Hubertus") was sent out.'));
}
+ //WP Ticket #4539
+ function test_basic_quotes() {
+ $this->assertEquals('test’s', wptexturize('test\'s'));
+ $this->assertEquals('test’s', wptexturize('test\'s'));
+
+ $this->assertEquals('‘quoted’', wptexturize('\'quoted\''));
+ $this->assertEquals('“quoted”', wptexturize('"quoted"'));
+
+ $this->assertEquals('(‘quoted’)', wptexturize('(\'quoted\')'));
+ $this->assertEquals('{“quoted”}', wptexturize('{"quoted"}'));
+
+ $this->assertEquals('‘qu(ot)ed’', wptexturize('\'qu(ot)ed\''));
+ $this->assertEquals('“qu{ot}ed”', wptexturize('"qu{ot}ed"'));
+
+ $this->assertEquals('‘test’s quoted’', wptexturize('\'test\'s quoted\''));
+ $this->assertEquals('“test’s quoted”', wptexturize('"test\'s quoted"'));
+ }
+
+ //WP Ticket #4539
function test_quotes() {
- $this->knownWPBug(4539);
$this->assertEquals('“Quoted String”', wptexturize('"Quoted String"'));
$this->assertEquals('Here is “a test with a link”', wptexturize('Here is "a test with a link"'));
- $this->assertEquals('Here is “a test with a link and a period ”.', wptexturize('Here is "a test with a link and a period".'));
+ $this->assertEquals('Here is “a test with a link and a period”.', wptexturize('Here is "a test with a link and a period".'));
$this->assertEquals('Here is “a test with a link” and a space.', wptexturize('Here is "a test with a link" and a space.'));
$this->assertEquals('Here is “a test with a link and some text quoted”', wptexturize('Here is "a test with a link and some text quoted"'));
$this->assertEquals('Here is “a test with a link”, and a comma.', wptexturize('Here is "a test with a link", and a comma.'));
$this->assertEquals('Here is “a test with a link”; and a semi-colon.', wptexturize('Here is "a test with a link"; and a semi-colon.'));
$this->assertEquals('Here is “a test with a link”- and a dash.', wptexturize('Here is "a test with a link"- and a dash.'));
- $this->assertEquals('Here is “a test with a link”... and ellipses.', wptexturize('Here is "a test with a link"... and ellipses.'));
+ $this->assertEquals('Here is “a test with a link”… and ellipses.', wptexturize('Here is "a test with a link"... and ellipses.'));
$this->assertEquals('Here is “a test with a link”.', wptexturize('Here is "a test with a link".'));
$this->assertEquals('Here is “a test with a link”and a work stuck to the end.', wptexturize('Here is "a test with a link"and a work stuck to the end.'));
$this->assertEquals('A test with a finishing number, “like 23”.', wptexturize('A test with a finishing number, "like 23".'));
$this->assertEquals('A test with a number, “like 62”, 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’s', wptexturize("test's"));
$this->assertEquals('‘test’s', wptexturize("'test's"));
$this->assertEquals('‘test’s’', wptexturize("'test's'"));
@@ -415,16 +432,40 @@
//WP Ticket #4539
function test_quotes_before_numbers() {
- $this->knownWPBug(4539);
$this->assertEquals('Class of ’99', wptexturize("Class of '99"));
+ $this->assertEquals('Class of ’99’s', wptexturize("Class of '99's"));
$this->assertEquals('‘Class of ’99’', wptexturize("'Class of '99'"));
+ $this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99's'"));
+ $this->assertEquals('‘Class of ’99’s’', wptexturize("'Class of '99’s'"));
+ $this->assertEquals('“Class of 99”', wptexturize("\"Class of 99\""));
+ $this->assertEquals('“Class of ’99”', wptexturize("\"Class of '99\""));
}
+ function test_quotes_after_numbers() {
+ $this->assertEquals('Class of ’99', wptexturize("Class of '99"));
+ }
+
+ //WP Ticket #15241
function test_other_html() {
- $this->knownWPBug(15241);
- $this->assertEquals('‘Quoted Text’,', wptexturize("'Quoted Text',"));
+ $this->assertEquals('‘', wptexturize("'"));
+ $this->assertEquals('‘Quoted Text’,', wptexturize('\'Quoted Text\','));
$this->assertEquals('“Quoted Text”,', wptexturize('"Quoted Text",'));
}
+
+ function test_x() {
+ $this->assertEquals('14×24', wptexturize("14x24"));
+ }
+
+ function test_minutes_seconds() {
+ $this->assertEquals('9′', wptexturize('9\''));
+ $this->assertEquals('9″', wptexturize("9\""));
+
+ $this->assertEquals('a 9′ b', wptexturize('a 9\' b'));
+ $this->assertEquals('a 9″ b', wptexturize("a 9\" b"));
+
+ $this->assertEquals('“a 9′ b”', wptexturize('"a 9\' b"'));
+ $this->assertEquals('‘a 9″ b’', wptexturize("'a 9\" b'"));
+ }
}
class TestCleanUrl extends WPTestCase {
Index: wordpress/wp-includes/formatting.php
===================================================================
--- wordpress/wp-includes/formatting.php (revision 16231)
+++ wordpress/wp-includes/formatting.php (working copy)
@@ -56,9 +56,25 @@
$static_characters = array_merge(array('---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)'), $cockney);
$static_replacements = array_merge(array('—', ' — ', '–', ' – ', 'xn--', '…', $opening_quote, $closing_quote, ' ™'), $cockneyreplace);
- $dynamic_characters = array('/\'(\d\d(?:’|\')?s)/', '/\'(\d)/', '/(\s|\A|[([{<]|")\'/', '/(\d)"/', '/(\d)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{<])"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
- $dynamic_replacements = array('’$1','’$1', '$1‘', '$1″', '$1′', '$1’$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '’$1', '$1×$2');
-
+ $dynamic_map = array(
+ '/\'(\d)/' => '’$1', // '99
+
+ '/\'([^\']*)\'([^\']*)\'/' => '‘$1’$2’', // 'test's'
+
+ '/\'([^\']*)\'/' => '‘$1’', // 'asd'
+ '/"([^"]*)"/' => $opening_quote . '$1' . $closing_quote, // "qwe"
+
+ '/(\w)\'(\w)/' => '$1’$2', // test's
+
+ '/(\d)"/' => '$1″', // 9" -> 9″
+ '/(\d)\'/' => '$1′', // 9' -> 9′
+
+ '/\b(\d+)x(\d+)\b/' => '$1×$2' // 10. 97x34 => 97×34
+ );
+
+ $dynamic_characters = array_keys($dynamic_map);
+ $dynamic_replacements = array_values($dynamic_map);
+
$static_setup = true;
}
@@ -69,6 +85,9 @@
$no_texturize_tags_stack = array();
$no_texturize_shortcodes_stack = array();
+
+ $single_quote_state = '‘';
+ $doube_quote_state = $opening_quote;
for ( $i = 0; $i < $stop; $i++ ) {
$curl = $textarr[$i];
@@ -80,6 +99,15 @@
$curl = str_replace($static_characters, $static_replacements, $curl);
// regular expressions
$curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
+ // quotes that span multiple tags & shortcodes
+ while (($pos = strpos($curl, '\'')) !== FALSE) {
+ $curl = preg_replace('/\'/', $single_quote_state, $curl);
+ $single_quote_state = (($single_quote_state == '‘') ? '’' : '‘');
+ }
+ while (($pos = strpos($curl, '"')) !== FALSE) {
+ $curl = preg_replace('/"/', $doube_quote_state, $curl);
+ $doube_quote_state = (($doube_quote_state == $opening_quote) ? $closing_quote : $opening_quote);
+ }
} elseif (!empty($curl)) {
/*
* Only call _wptexturize_pushpop_element if first char is correct