diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
| commit | c4bd43432df03e4f4835c7689c8ed722cd2c3020 (patch) | |
| tree | 5603166833d78b0581bbe880adb53b6de085719d /system/core/Security.php | |
| parent | 488ad40ba334ca506f07bede97724726eac2b27f (diff) | |
| parent | 9180a1264dc536c34e5cc8a0e44bb399a8ba484f (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/core/Security.php')
| -rw-r--r-- | system/core/Security.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/system/core/Security.php b/system/core/Security.php index d5305d1ca..a29070095 100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -678,12 +678,7 @@ class CI_Security { { if ( ! isset($_entities)) { - $_entities = array_map( - 'strtolower', - is_php('5.3.4') - ? get_html_translation_table(HTML_ENTITIES, $flag, $charset) - : get_html_translation_table(HTML_ENTITIES, $flag) - ); + $_entities = array_map('strtolower', get_html_translation_table(HTML_ENTITIES, $flag, $charset)); // If we're not on PHP 5.4+, add the possibly dangerous HTML 5 // entities to the array manually |