summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Sowell <robin.sowell@ellislab.com>2009-07-18 00:07:04 +0200
committerRobin Sowell <robin.sowell@ellislab.com>2009-07-18 00:07:04 +0200
commit8db2d5ebf30d7d8e648f36e9d669297a9a52cd3d (patch)
treead8bedb38554de15495b46904c9789d14fd3e5da
parent3eb9faceb9fedb0fa50a2b2d1fc4952c2652af70 (diff)
Added heading tags to skippable elements in the typography class- started as 1.6 EE bug fix- carried over.
-rw-r--r--system/libraries/Typography.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index a16839362..242ca3cb6 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -30,7 +30,7 @@ class CI_Typography {
var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
// Elements that should not have <p> and <br /> tags within them.
- var $skip_elements = 'p|pre|ol|ul|dl|object|table';
+ var $skip_elements = 'p|pre|ol|ul|dl|object|table|h\d';
// Tags we want the parser to completely ignore when splitting the string.
var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 42529d1ff..7bf5028d3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -112,6 +112,7 @@ SVN Revision: </p>
<li>Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element</li>
<li>Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.</li>
<li>Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.</li>
+ <li>Fixed a bug in the typography class where heading tags could have paragraph tags inserted when using auto_typography().</li>
</ul>
<h2>Version 1.7.1</h2>