diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-09-30 02:47:54 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-09-30 02:47:54 +0200 |
| commit | fa5c4101d4dc171824e222d4650e0ad15409fce0 (patch) | |
| tree | b4b70ae860ff39c421f052069b15cc7c7c78b9a6 /system | |
| parent | f2b7f62f79791cae890a84a4f7b0eeb46449a5d1 (diff) | |
moved object out of inline elements to the block elements and skip elements variables. Yes, I know it's technically an inline element, but it's common usage is as a block element, and the typography parser needs to know not to smash a bunch of paragraph tags and <br />s inside of it, regardless of how it's used
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Typography.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 7eaa4057d..7cdf7ddd6 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -27,13 +27,13 @@ class CI_Typography { // Block level elements that should not be wrapped inside <p> tags - var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|ol|p|pre|script|table|ul'; + 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|table'; + var $skip_elements = 'p|pre|ol|ul|dl|object|table'; // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|object|samp|select|span|strong|sub|sup|textarea|var'; + var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var'; /** * Nothing to do here... |