diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-01-12 17:59:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 17:59:15 +0100 |
commit | e4e39910f30b928abaa68ca2cd9c36937ea4857a (patch) | |
tree | b999a6f62b9f983380c47bb78576606061080865 /lib/private | |
parent | b6e4f34a79d32ed68f7aa22154ac71a6efc1347d (diff) | |
parent | b356d0dfc45c8535ce9032bae866fca873de6e38 (diff) | |
download | nextcloud-server-e4e39910f30b928abaa68ca2cd9c36937ea4857a.tar.gz nextcloud-server-e4e39910f30b928abaa68ca2cd9c36937ea4857a.zip |
Merge pull request #7819 from nextcloud/fix-explode-in-legacy-helper.php
Fix explode() call in legacy/helper.php to have correct types
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/legacy/helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 8bbfb235ee2..e88e967a57b 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -477,12 +477,12 @@ class OC_Helper { return false; } $ini = \OC::$server->getIniWrapper(); - $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; |