summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/helpers/security_helper.php6
-rw-r--r--user_guide/changelog.html1
2 files changed, 4 insertions, 3 deletions
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 0e2ba788d..4dbbf728a 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -32,15 +32,15 @@
*
* @access public
* @param string
- * @param string the character set of your data
+ * @param bool whether or not the content is an image file
* @return string
*/
if ( ! function_exists('xss_clean'))
{
- function xss_clean($str, $charset = 'ISO-8859-1')
+ function xss_clean($str, $is_image = FALSE)
{
$CI =& get_instance();
- return $CI->input->xss_clean($str, $charset);
+ return $CI->input->xss_clean($str, $is_image);
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 1992ebbe2..7a26cb39a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -127,6 +127,7 @@ SVN Revision: </p>
<li>Fixed a bug in the Text Helper character limiter where the provided limit intersects the last word of the string.</li>
<li>Fixed a bug (#6342) with plural() in the Inflection helper with words ending in "y".</li>
<li>Fixed bug (#6517) where Routed URI segments returned by URI::rsegment() method were incorrect for the default controller.</li>
+ <li>Fixed a bug (#6706) in the Security Helper where xss_clean() was using a deprecated second argument.</li>
<li>Tweaked Typography::auto_typography() for some edge-cases.</li>
</ul>