Changeset 27844

Timestamp:

03/29/2014 08:59:38 AM (11 years ago)

Author:

nacin

Message:

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

File:

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

trunk/src/wp-includes/formatting.php

@@ -88 +88 @@
 
         // '99 '99s '99's (apostrophe)
-        if ( "'" != $apos )
+        if ( "'" !== $apos ) {
             $dynamic[ '/\'(?=\d)/' ] = $apos;
+        }
 
         // Single quote at start, or preceded by (, {, <, [, ", or spaces.
-        if ( "'" != $opening_single_quote )
+        if ( "'" !== $opening_single_quote ) {
             $dynamic[ '/(?<=\A|[([{<"]|' . $spaces . ')\'/' ] = $opening_single_quote;
+        }
 
         // 9" (double prime)
-        if ( '"' != $double_prime )
+        if ( '"' !== $double_prime ) {
             $dynamic[ '/(?<=\d)"/' ] = $double_prime;
+        }
 
         // 9' (prime)
-        if ( "'" != $prime )
+        if ( "'" !== $prime ) {
             $dynamic[ '/(?<=\d)\'/' ] = $prime;
+        }
 
         // Apostrophe in a word.  No spaces or double primes.
-        if ( "'" != $apos )
+        if ( "'" !== $apos ) {
             $dynamic[ '/(?<!' . $spaces . ')\'(?!\'|' . $spaces . ')/' ] = $apos;
+        }
 
         // 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;
+        }
 
         // Any remaining double quotes.
-        if ( '"' != $closing_quote )
+        if ( '"' !== $closing_quote ) {
             $dynamic[ '/"/' ] = $closing_quote;
+        }
 
         // Single quotes followed by spaces or a period.
-        if ( "'" != $closing_single_quote )
-            $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote; 
+        if ( "'" !== $closing_single_quote ) {
+            $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
+        }
 
         $dynamic_characters = array_keys( $dynamic );
@@ -148 +156 @@
 
     foreach ( $textarr as &$curl ) {
-        if ( empty( $curl ) )
+        if ( empty( $curl ) ) {
             continue;
+        }
 
         // Only call _wptexturize_pushpop_element if first char is correct tag opening
@@ -213 +222 @@
 
             // Make sure it matches the opening tag
-            if ($last != $matches[1])
-                array_push($stack, $last);
+            if ( $last != $matches[1] ) {
+                array_push( $stack, $last );
+            }
         }
     }