From 8ec192ce1fe8a7df7a4313c8d39be1c8b10996d2 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 1 Apr 2015 19:09:28 +0000
Subject: [PATCH] Alter the regex in `wptexturize()` to properly handle input
 like: `<> "Hello world" <>`.

Updates unit test data.

Props miqrogroove.
Fixes #30344.

Built from https://develop.svn.wordpress.org/trunk@31965


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

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index fbbdfc58ee..aaeb672dc8 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -235,7 +235,7 @@ function wptexturize($text, $reset = false) {
 		.     '(?(?=!--)'        // Is this a comment?
 		.         $comment_regex // Find end of comment.
 		.     '|'
-		.         '[^>]+>'       // Find end of element.
+		.         '[^>]*>'       // Find end of element.
 		.     ')'
 		. '|'
 		.     $shortcode_regex   // Find shortcodes.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f071f82786..c45d6c3a6a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31964';
+$wp_version = '4.2-beta3-31965';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.