From 5574110c817aa1f9c5c71e1b7cffedb69baf7457 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Thu, 11 Sep 2008 20:11:59 +0000
Subject: Tweaked the auto_typography function

---
 system/helpers/typography_helper.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index ce628115a..f0dd6fd90 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -69,16 +69,21 @@ if ( ! function_exists('nl2br_except_pre'))
  *
  * @access	public
  * @param	string
+ * @param	bool	whether to allow javascript event handlers
+ * @param	bool	whether to reduce multiple instances of double newlines to two
  * @return	string
  */
 if ( ! function_exists('auto_typography'))
 {
-	function auto_typography($str)
+	function auto_typography($str, $allow_event_handlers = FALSE, $reduce_empty_lines = FALSE)
 	{
 		$CI =& get_instance();
 	
 		$CI->load->library('typography');
 		
+		$CI->typography->allow_js_event_handlers($allow_event_handlers);
+		$CI->typography->reduce_empty_lines($reduce_empty_lines);
+		
 		return $CI->typography->convert($str);
 	}
 }
-- 
cgit v1.2.3-24-g4f1b