diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-09 13:54:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-09 13:54:58 +0100 |
| commit | 5d456c7cc21f7640435c4638932984a52b4cdbac (patch) | |
| tree | 0227a865782fab4895f602a7c118d92e21998cbb /lib/private/helper.php | |
| parent | d50c7391d8e78c9555b073fb9ccc6a91d5da34bc (diff) | |
| parent | d8b8abb429d3d66598a16d25cf55f7dc19e3f996 (diff) | |
| download | nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.tar.gz nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.zip | |
Merge branch 'master' into memcache-public
Diffstat (limited to 'lib/private/helper.php')
| -rw-r--r-- | lib/private/helper.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 4fe3097af26..1c8d01c141f 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -858,11 +858,13 @@ class OC_Helper { if (!function_exists($function_name)) { return false; } - $disabled = explode(', ', ini_get('disable_functions')); + $disabled = explode(',', ini_get('disable_functions')); + $disabled = array_map('trim', $disabled); if (in_array($function_name, $disabled)) { return false; } - $disabled = explode(', ', ini_get('suhosin.executor.func.blacklist')); + $disabled = explode(',', ini_get('suhosin.executor.func.blacklist')); + $disabled = array_map('trim', $disabled); if (in_array($function_name, $disabled)) { return false; } |