Index: src/wp-includes/formatting.php
===================================================================
--- src/wp-includes/formatting.php (revision 27852)
+++ src/wp-includes/formatting.php (working copy)
@@ -86,6 +86,14 @@
// Pattern-based replacements of characters.
$dynamic = array();
+ // Quoted Numbers like "42" or '42.00'
+ if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
+ $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[\d\.\,]*)"/' ] = $opening_quote . '$1' . $closing_quote;
+ }
+ if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
+ $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
+ }
+
// '99 '99s '99's (apostrophe)
if ( "'" !== $apos ) {
$dynamic[ '/\'(?=\d)/' ] = $apos;
Index: tests/phpunit/tests/formatting/WPTexturize.php
===================================================================
--- tests/phpunit/tests/formatting/WPTexturize.php (revision 27852)
+++ tests/phpunit/tests/formatting/WPTexturize.php (working copy)
@@ -154,8 +154,8 @@
function test_wptexturize_quotes_around_numbers() {
$this->assertEquals('“12345”', wptexturize('"12345"'));
$this->assertEquals('‘12345’', wptexturize('\'12345\''));
- $this->assertEquals('“a 9′ plus a ‘9’, maybe a 9′ ‘9’ ”', wptexturize('"a 9\' plus a \'9\', maybe a 9\' \'9\' "'));
- $this->assertEquals('‘99
‘123’
’tis
‘s’
', wptexturize('\'99
\'123\'
\'tis
\'s\'
'));
+ $this->assertEquals('“a 9′ plus a ‘9’, maybe a 9′ ‘9’”', wptexturize('"a 9\' plus a \'9\', maybe a 9\' \'9\'"'));
+ $this->assertEquals('’99
‘123’
’tis
‘s’
', wptexturize('\'99
\'123\'
\'tis
\'s\'
'));
}
/**
@@ -305,21 +305,9 @@
"word ’99’s word",
),
array(
- "word '99's word", // Due to the logic error, second apos becomes a prime. See ticket #22823
- "word ’99′s word",
- ),
- array(
- "word '99'samsonite",
- "word ’99′samsonite",
- ),
- array(
"according to our source, '33% of all students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
"according to our source, ’33% of all students scored less than 50′ on the test.",
),
- array(
- "word '99' word", // See ticket #8775
- "word ’99′ word",
- ),
);
}
@@ -994,4 +982,56 @@
),
);
}
+
+ /**
+ * Numbers inside of matching quotes get curly quotes instead of apostrophes and primes.
+ *
+ * @ticket 8775
+ * @dataProvider data_quoted_numbers
+ */
+ function test_quoted_numbers( $input, $output ) {
+ return $this->assertEquals( $output, wptexturize( $input ) );
+ }
+
+ function data_quoted_numbers() {
+ return array(
+ array(
+ 'word "42.00" word',
+ 'word “42.00” word',
+ ),
+ array(
+ 'word "42.00"word',
+ 'word “42.00”word',
+ ),
+ array(
+ "word '42.00' word",
+ "word ‘42.00’ word",
+ ),
+ array(
+ "word '42.00'word",
+ "word ‘42.00’word",
+ ),
+ array(
+ 'word "42" word',
+ 'word “42” word',
+ ),
+ array(
+ 'word "42,00" word',
+ 'word “42,00” word',
+ ),
+ array(
+ 'word "4,242.00" word',
+ 'word “4,242.00” word',
+ ),
+ array(
+ "word '99's word", // Is this correct?
+ "word ‘99’s word",
+ ),
+ array(
+ "word '99'samsonite",
+ "word ‘99’samsonite",
+ ),
+ );
+ }
+
}