Changeset 25339

Timestamp:

09/11/2013 03:28:20 AM (11 years ago)

Author:

nacin

Message:

Improve clarity and speed of [25320] (merged as [25325]). Merges [25338] to 3.6.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/functions.php (modified) (1 diff)

branches/3.6/wp-includes/functions.php

@@ -263 +263 @@
             return false;
     } else {
-        // ensures ; or } exists but is not in the first X chars
-        if ( strpos( $data, ';' ) < 3 && strpos( $data, '}' ) < 4 )
+        $semicolon = strpos( $data, ';' );
+        $brace     = strpos( $data, '}' );
+        // Either ; or } must exist.
+        if ( false === $semicolon && false === $brace )
+            return false;
+        // But neither must be in the first X characters.
+        if ( false !== $semicolon && $semicolon < 3 )
+            return false;
+        if ( false !== $brace && $brace < 4 )
             return false;
     }