Changeset 28762 for trunk/src/wp-includes/formatting.php

Timestamp:

06/17/2014 05:56:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Add Unit Tests for i18n and wptexturize(). Don't confuse closing single quotes and apostrophes.

See #27426.

File:

• trunk/src/wp-includes/formatting.php (modified) (4 diffs)

trunk/src/wp-includes/formatting.php

@@ -25 +25 @@
  *
  * @param string $text The text to be formatted
+ * @param bool $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize($text) {
+function wptexturize($text, $reset = false) {
     global $wp_cockneyreplace;
     static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
         $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
 
-    if ( false === $run_texturize ) {
+    // If there's nothing to do, just stop.
+    if ( empty( $text ) || false === $run_texturize ) {
         return $text;
     }
 
-    // No need to set up these static variables more than once
-    if ( ! isset( $static_characters ) ) {
+    // Set up static variables. Run once only.
+    if ( $reset || ! isset( $static_characters ) ) {
         /**
          * Filter whether to skip running `wptexturize()`.
@@ -124 +126 @@
         }
 
-        // Apostrophe in a word.  No spaces or double apostrophes.
+        // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
         if ( "'" != $apos ) {
-            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|\'|' . $spaces . ')/' ] = $apos;
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
         }
 
@@ -149 +151 @@
         }
 
-        // Single quotes followed by spaces or a period.
-        if ( "'" !== $closing_single_quote ) {
-            $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
+        // Single quotes followed by spaces or ending punctuation.
+        if ( "'" != $closing_single_quote ) {
+            $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote; 
         }
 
@@ -162 +164 @@
         $dynamic_characters = array_keys( $dynamic );
         $dynamic_replacements = array_values( $dynamic );
-    }
-
-    // If there's nothing to do, just stop.
-    if ( empty( $text ) ) {
-        return $text;
     }