From ac91bd701c11e8c9e5cb42b1120eb9f88f73456a Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Sun, 26 Oct 2008 21:52:41 +0000
Subject: Fixed some typos

---
 system/application/config/autoload.php | 11 -----------
 system/database/DB_driver.php          |  2 +-
 system/helpers/typography_helper.php   |  5 ++---
 system/libraries/Typography.php        | 11 ++---------
 4 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'system')

diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index b99ffe484..8e896d011 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -111,17 +111,6 @@ $autoload['language'] = array();
 $autoload['model'] = array();
 
 
-/*
-| -------------------------------------------------------------------
-|  Auto-load Core Libraries
-| -------------------------------------------------------------------
-|
-| DEPRECATED:  Use $autoload['libraries'] above instead.
-|
-*/
-// $autoload['core'] = array();
-
-
 
 /* End of file autoload.php */
 /* Location: ./system/application/config/autoload.php */
\ No newline at end of file
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 07c19c51b..866b95612 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1218,7 +1218,7 @@ class CI_DB_driver {
 			
 			// Does the first segment of the exploded item match
 			// one of the aliases previously identified?  If so,
-			// we have nothing more to do other then escape the item
+			// we have nothing more to do other than escape the item
 			if (in_array($parts[0], $this->ar_aliased_tables))
 			{				
 				if ($protect_identifiers === TRUE)
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index f1bb25bf1..d3cc7f175 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -54,17 +54,16 @@ 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, $strip_js_event_handlers = TRUE, $reduce_linebreaks = FALSE)
+	function auto_typography($str, $reduce_linebreaks = FALSE)
 	{
 		$CI =& get_instance();	
 		$CI->load->library('typography');
-		return $CI->typography->auto_typography($str, $strip_js_event_handlers, $reduce_linebreaks);
+		return $CI->typography->auto_typography($str, $reduce_linebreaks);
 	}
 }
 
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}
-- 
cgit v1.2.3-24-g4f1b