From 8ee4986acbc68ab78bda74de02239f30d0d8e6b2 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Mon, 22 Mar 2004 01:34:32 +0000
Subject: [PATCH] Texturize kung-foo

git-svn-id: https://develop.svn.wordpress.org/trunk@985 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/functions-formatting.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index 8726f33556..cfb73b1cc6 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -18,14 +18,14 @@ function wptexturize($text) {
 			$cockneyreplace = array("&#8217;tain&#8217;t","&#8217;twere","&#8217;twas","&#8217;tis","&#8217;twill","&#8217;til","&#8217;bout","&#8217;nuff","&#8217;round");
 			$curl = str_replace($cockney, $cockneyreplace, $curl);
 
-			$curl = preg_replace("/'s/", "&#8217;s", $curl);
+			$curl = preg_replace("/'s/", '&#8217;s', $curl);
 			$curl = preg_replace("/'(\d\d(?:&#8217;|')?s)/", "&#8217;$1", $curl);
 			$curl = preg_replace('/(\s|\A|")\'/', '$1&#8216;', $curl);
-			$curl = preg_replace("/(\d+)\"/", "$1&Prime;", $curl);
-			$curl = preg_replace("/(\d+)'/", "$1&prime;", $curl);
+			$curl = preg_replace('/(\d+)"/', '$1&Prime;', $curl);
+			$curl = preg_replace("/(\d+)'/", '$1&prime;', $curl);
 			$curl = preg_replace("/(\S)'([^'\s])/", "$1&#8217;$2", $curl);
-			$curl = preg_replace('/"([\s.,!?;:&\']|\Z)/', '&#8221;$1', $curl);
-            $curl = preg_replace('/(\s|\A)"/', '$1&#8220;', $curl);
+			$curl = preg_replace('/(\s|\A)"(?!\s)/', '$1&#8220;$2', $curl);
+			$curl = preg_replace('/"(\s|\Z)/', '&#8221;$1', $curl);
 			$curl = preg_replace("/'([\s.]|\Z)/", '&#8217;$1', $curl);
 			$curl = preg_replace("/\(tm\)/i", '&#8482;', $curl);
 			$curl = preg_replace("/\(c\)/i", '&#169;', $curl);