summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-07-22 12:50:30 +0200
committerAndrey Andreev <narf@devilix.net>2015-07-22 12:50:30 +0200
commit9e25daf2d7126f465ceb34789b6f76c9c77981b4 (patch)
tree432dfdeb1606c864e85dddfaa6dba8b6725d1587
parentb63dc1904e4f34cb48d7dce80155172c6e94d777 (diff)
Remove eval()-related logic from function_exists()
#3991 shows that all such checks are useless as function_exists('eval') will always return FALSE.
-rw-r--r--system/core/Common.php16
1 files changed, 3 insertions, 13 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index b850fd39a..ce324a1cc 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -833,19 +833,9 @@ if ( ! function_exists('function_usable'))
{
if ( ! isset($_suhosin_func_blacklist))
{
- if (extension_loaded('suhosin'))
- {
- $_suhosin_func_blacklist = explode(',', trim(ini_get('suhosin.executor.func.blacklist')));
-
- if ( ! in_array('eval', $_suhosin_func_blacklist, TRUE) && ini_get('suhosin.executor.disable_eval'))
- {
- $_suhosin_func_blacklist[] = 'eval';
- }
- }
- else
- {
- $_suhosin_func_blacklist = array();
- }
+ $_suhosin_func_blacklist = extension_loaded('suhosin')
+ ? explode(',', trim(ini_get('suhosin.executor.func.blacklist')))
+ : array();
}
return ! in_array($function_name, $_suhosin_func_blacklist, TRUE);