summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Typography.php4
-rw-r--r--user_guide/changelog.html1
2 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 0c4a978aa..a4d1e3548 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -196,9 +196,9 @@ class CI_Typography {
// Clean up stray paragraph tags that appear before block level elements
'#<p></p><('.$this->block_elements.')#' => '<$1',
-
+
// Clean up stray non-breaking spaces preceeding block elements
- '#[&nbsp; ]+<('.$this->block_elements.')#' => ' <$1',
+ '#(&nbsp;\s*)+<('.$this->block_elements.')#' => ' <$2',
// Replace the temporary markers we added earlier
'/\{@TAG\}/' => '<',
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 1ddec5456..3b9c73e5f 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -98,6 +98,7 @@ SVN Revision: </p>
<li>Fixed a bug with high ascii characters in subject and from email headers.</li>
<li>Fixed a bug in xss_clean() where whitespace following a validated character entity would not be preserved.</li>
<li>Fixed a bug where HTML comments and &lt;pre&gt; tags were being parsed in Typography::auto_typography()</li>
+ <li>Fixed a bug with non-breaking space cleanup in Typography::auto_typography()</li>
</ul>