Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 6 insertions, 16 deletions

diff --git a/system/helpers/security.php b/system/helpers/security.php
index cd48d2e0..33e5118e 100644
--- a/system/helpers/security.php
+++ b/system/helpers/security.php
@@ -2,12 +2,12 @@
 /**
  * Security helper class.
  *
- * $Id: security.php 3769 2008-12-15 00:48:56Z zombor $
+ * $Id: security.php 4698 2009-12-08 18:39:33Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class security_Core {
 
@@ -15,11 +15,12 @@ class security_Core {
 	 * Sanitize a string with the xss_clean method.
 	 *
 	 * @param   string  string to sanitize
+	 * @param   string  xss_clean method to use ('htmlpurifier' or defaults to built-in method)
 	 * @return  string
 	 */
-	public static function xss_clean($str)
+	public static function xss_clean($str, $tool = NULL)
 	{
-		return Input::instance()->xss_clean($str);
+		return Input::instance()->xss_clean($str, $tool);
 	}
 
 	/**
@@ -33,15 +34,4 @@ class security_Core {
 		return preg_replace('#<img\s.*?(?:src\s*=\s*["\']?([^"\'<>\s]*)["\']?[^>]*)?>#is', '$1', $str);
 	}
 
-	/**
-	 * Remove PHP tags from a string.
-	 *
-	 * @param   string  string to sanitize
-	 * @return  string
-	 */
-	public static function encode_php_tags($str)
-	{
-		return str_replace(array('<?', '?>'), array('&lt;?', '?&gt;'), $str);
-	}
-
 } // End security
\ No newline at end of file