Changeset 28776

Timestamp:

06/19/2014 12:00:27 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Move preg_match() that should only run once out of the loop.

props dllh.
fixes #28575.

File:

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

trunk/src/wp-includes/formatting.php

@@ -215 +215 @@
     $textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
 
+    $do_times_check = ( 1 === preg_match( '/(?<=\d)x-?\d/', $text ) );
+
     foreach ( $textarr as &$curl ) {
         // Only call _wptexturize_pushpop_element if $curl is a delimeter.
@@ -243 +245 @@
 
             // 9x9 (times), but never 0x9999
-            if ( 1 === preg_match( '/(?<=\d)x-?\d/', $text ) ) {
+            if ( $do_times_check ) {
                 // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
                 $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(-?\d[\d\.,]*)\b/', '$1&#215;$2', $curl );