summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-10-26 22:52:41 +0100
committerRick Ellis <rick.ellis@ellislab.com>2008-10-26 22:52:41 +0100
commitac91bd701c11e8c9e5cb42b1120eb9f88f73456a (patch)
treee263e6207daaa83bb9768988cdbdb30ad91944b8 /system/libraries
parent4ba802d8f0a28ba138c21cd90d336e220f81a099 (diff)
Fixed some typos
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Typography.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 0ee6a24d0..5a97da715 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -59,11 +59,10 @@ class CI_Typography {
*
* @access public
* @param string
- * @param bool whether to strip javascript event handlers for security
* @param bool whether to reduce more then two consecutive newlines to two
* @return string
*/
- function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebreaks = FALSE)
+ function auto_typography($str, $reduce_linebreaks = FALSE)
{
if ($str == '')
{
@@ -81,13 +80,7 @@ class CI_Typography {
if ($reduce_linebreaks === TRUE)
{
$str = preg_replace("/\n\n+/", "\n\n", $str);
- }
-
- // Do we allow JavaScript event handlers? If not, we strip them from within all tags
- if ($strip_js_event_handlers === TRUE)
- {
- $str = preg_replace("#<([^><]+?)([^a-z_\-]on\w*|xmlns)(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str);
- }
+ }
// Convert quotes within tags to temporary markers. We don't want quotes converted
// within tags so we'll temporarily convert them to {@DQ} and {@SQ}