summaryrefslogtreecommitdiff
path: root/system/helpers/security.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-11-24 19:20:36 -0800
committerBharat Mediratta <bharat@menalto.com>2009-11-24 19:20:36 -0800
commit9b6663f87a7e679ffba691cf516191fc840cf978 (patch)
tree20cf9f3aaf93b4ba69d282dcf10d259db4a752de /system/helpers/security.php
parent82ee5f9d338017c69331b2907f37a468ced8c66e (diff)
Update to Kohana r4684 which is now Kohana 2.4 and has substantial
changes.
Diffstat (limited to 'system/helpers/security.php')
-rw-r--r--system/helpers/security.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/system/helpers/security.php b/system/helpers/security.php
index cd48d2e0..9eb82a58 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 4679 2009-11-10 01:45:52Z 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);
}
/**