From 14b0899e57b19a093086ab7632dc8f5ae4b3d7ce Mon Sep 17 00:00:00 2001
From: Mark Jaquith <mark@wordpress.org>
Date: Sat, 6 Dec 2014 21:24:23 +0000
Subject: [PATCH] Revert [28719] and no longer math-process multiplication of
 negative numbers

see #19308
fixes #30445
props rmccue
Built from https://develop.svn.wordpress.org/trunk@30752


git-svn-id: http://core.svn.wordpress.org/trunk@30742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index d79925074a..9bb1538d80 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -288,9 +288,9 @@ function wptexturize($text, $reset = false) {
 			}
 
 			// 9x9 (times), but never 0x9999
-			if ( 1 === preg_match( '/(?<=\d)x-?\d/', $curl ) ) {
+			if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {
 				// 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 );
+				$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
 			}
 		}
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5f54cf0e92..3cd49aa296 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30751';
+$wp_version = '4.1-beta2-30752';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.