diff options
| -rw-r--r-- | system/libraries/Input.php | 4 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Input.php b/system/libraries/Input.php index ba94d854f..b41dcfb29 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -852,8 +852,8 @@ class CI_Input { */
function _html_entity_decode_callback($match)
{
- $CI =& get_instance();
- $charset = $CI->config->item('charset');
+ global $CFG;
+ $charset = $CFG->item('charset');
return $this->_html_entity_decode($match[0], strtoupper($charset));
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1864c7985..568448fc6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@ Change Log <ul>
<li>Fixed a bug in database driver where num_rows property wasn't getting updated </li>
<li>Fixed a bug in captcha calling an invalid PHP function</li>
+ <li>Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.</li>
</ul>
|