summaryrefslogtreecommitdiffstats
path: root/system/libraries/Typography.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
commit0ab28ced4d4f20d5857fae9ec0e20452d4ac181b (patch)
treefae554725bd9b187f9b298e5702f951ac394a6d7 /system/libraries/Typography.php
parentd013c63462b4eaa2ac2f684b2ad498a9c4fb7dd5 (diff)
parente30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff)
merge upstream
Diffstat (limited to 'system/libraries/Typography.php')
-rw-r--r--system/libraries/Typography.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 50bd12486..6aaa993ae 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -38,7 +38,7 @@ class CI_Typography {
/**
* Block level elements that should not be wrapped inside <p> tags
- *
+ *
* @var string
*/
public $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
@@ -52,7 +52,7 @@ class CI_Typography {
/**
* Tags we want the parser to completely ignore when splitting the string.
- *
+ *
* @var string
*/
public $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';