From 232484c0c7ec9987459851039c2e2d14578ec133 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Thu, 15 Jan 2009 19:10:48 +0000
Subject: Fixed a bug when an opening quote is preceded by a paragraph tag and
 immediately followed by another tag.

---
 system/libraries/Typography.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Typography.php')

diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 11b3917c0..1ae45774a 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -267,23 +267,23 @@ class CI_Typography {
 							// on which direction to curl, with non-word characters like punctuation
 							// being a secondary factor only after whitespace is addressed.
 							'/\'"(\s|$)/'					=> '&#8217;&#8221;$1',
-							'/(^|\s)\'"/'					=> '$1&#8216;&#8220;',
+							'/(^|\s|<p>)\'"/'				=> '$1&#8216;&#8220;',
 							'/\'"(\W)/'						=> '&#8217;&#8221;$1',
 							'/(\W)\'"/'						=> '$1&#8216;&#8220;',
 							'/"\'(\s|$)/'					=> '&#8221;&#8217;$1',
-							'/(^|\s)"\'/'					=> '$1&#8220;&#8216;',
+							'/(^|\s|<p>)"\'/'				=> '$1&#8220;&#8216;',
 							'/"\'(\W)/'						=> '&#8221;&#8217;$1',
 							'/(\W)"\'/'						=> '$1&#8220;&#8216;',
 
 							// single quote smart quotes
 							'/\'(\s|$)/'					=> '&#8217;$1',
-							'/(^|\s)\'/'					=> '$1&#8216;',
+							'/(^|\s|<p>)\'/'				=> '$1&#8216;',
 							'/\'(\W)/'						=> '&#8217;$1',
 							'/(\W)\'/'						=> '$1&#8216;',
 
 							// double quote smart quotes
 							'/"(\s|$)/'						=> '&#8221;$1',
-							'/(^|\s)"/'						=> '$1&#8220;',
+							'/(^|\s|<p>)"/'					=> '$1&#8220;',
 							'/"(\W)/'						=> '&#8221;$1',
 							'/(\W)"/'						=> '$1&#8220;',
 
-- 
cgit v1.2.3-24-g4f1b