summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-10-02 01:57:38 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-10-02 01:57:38 +0200
commitd95ebca78e200cb325dcf934492c83090cf2b462 (patch)
tree000eb11a6a11633ced0858bd0f4565fc06edbcfa /system
parent8e3869a90ae46c477ba1059a65fc480abea1cc03 (diff)
added $protect_braced_quotes to Typography class, to prevent curly-quoting single and double quoted string within {curly "braces"}
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Typography.php18
1 files changed, 17 insertions, 1 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 59a96dfdb..2393e164e 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -35,6 +35,9 @@ class CI_Typography {
// 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|samp|select|span|strong|sub|sup|textarea|var';
+ // whether or not to protect quotes within { curly braces }
+ var $protect_braced_quotes = FALSE;
+
/**
* Nothing to do here...
*
@@ -97,7 +100,20 @@ class CI_Typography {
$str);
}
}
-
+
+ if ($this->protect_braced_quotes === TRUE)
+ {
+ if (preg_match_all("#\{.+?}#si", $str, $matches))
+ {
+ for ($i = 0; $i < count($matches['0']); $i++)
+ {
+ $str = str_replace($matches['0'][$i],
+ str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]),
+ $str);
+ }
+ }
+ }
+
// Convert "ignore" tags to temporary marker. The parser splits out the string at every tag
// it encounters. Certain inline tags, like image tags, links, span tags, etc. will be
// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}