WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add braces to wptexturize() after [27839]. see #22692. 

Built from https://develop.svn.wordpress.org/trunk@27844


git-svn-id: http://core.svn.wordpress.org/trunk@27678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-03-29 09:00:15 +00:00
parent 6531ed1efc
commit cfa2246cc7
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/formatting.php
View File

@ -87,36 +87,44 @@ function wptexturize($text) {
$dynamic = array(); $dynamic = array();
// '99 '99s '99's (apostrophe) // '99 '99s '99's (apostrophe)
if ( "'" != $apos ) if ( "'" !== $apos ) {
$dynamic[ '/\'(?=\d)/' ] = $apos; $dynamic[ '/\'(?=\d)/' ] = $apos;
}
// Single quote at start, or preceded by (, {, <, [, ", or spaces. // Single quote at start, or preceded by (, {, <, [, ", or spaces.
if ( "'" != $opening_single_quote ) if ( "'" !== $opening_single_quote ) {
$dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote; $dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote;
}
// 9" (double prime) // 9" (double prime)
if ( '"' != $double_prime ) if ( '"' !== $double_prime ) {
$dynamic[ '/(?<=\d)"/' ] = $double_prime; $dynamic[ '/(?<=\d)"/' ] = $double_prime;
}
// 9' (prime) // 9' (prime)
if ( "'" != $prime ) if ( "'" !== $prime ) {
$dynamic[ '/(?<=\d)\'/' ] = $prime; $dynamic[ '/(?<=\d)\'/' ] = $prime;
}
// Apostrophe in a word. No spaces or double primes. // Apostrophe in a word. No spaces or double primes.
if ( "'" != $apos ) if ( "'" !== $apos ) {
$dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos; $dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos;
}
// Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces. // Double quote at start, or preceded by (, {, <, [, or spaces, and not followed by spaces.
if ( '"' != $opening_quote ) if ( '"' !== $opening_quote ) {
$dynamic[ '/(?<=\A|[([{<]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote; $dynamic[ '/(?<=\A|[([{<]|' . $spaces . ')"(?!' . $spaces . ')/' ] = $opening_quote;
}
// Any remaining double quotes. // Any remaining double quotes.
if ( '"' != $closing_quote ) if ( '"' !== $closing_quote ) {
$dynamic[ '/"/' ] = $closing_quote; $dynamic[ '/"/' ] = $closing_quote;
}
// Single quotes followed by spaces or a period. // Single quotes followed by spaces or a period.
if ( "'" != $closing_single_quote ) if ( "'" !== $closing_single_quote ) {
$dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote; $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
}
$dynamic_characters = array_keys( $dynamic ); $dynamic_characters = array_keys( $dynamic );
$dynamic_replacements = array_values( $dynamic ); $dynamic_replacements = array_values( $dynamic );
@ -147,8 +155,9 @@ function wptexturize($text) {
$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE); $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
foreach ( $textarr as &$curl ) { foreach ( $textarr as &$curl ) {
if ( empty( $curl ) ) if ( empty( $curl ) ) {
continue; continue;
}
// Only call _wptexturize_pushpop_element if first char is correct tag opening // Only call _wptexturize_pushpop_element if first char is correct tag opening
$first = $curl[0]; $first = $curl[0];
@ -212,8 +221,9 @@ function _wptexturize_pushpop_element($text, &$stack, $disabled_elements, $openi
$last = array_pop($stack); $last = array_pop($stack);
// Make sure it matches the opening tag // Make sure it matches the opening tag
if ($last != $matches[1]) if ( $last != $matches[1] ) {
array_push($stack, $last); array_push( $stack, $last );
}
} }
} }
} }