From b356d0dfc45c8535ce9032bae866fca873de6e38 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 12 Jan 2018 15:26:49 +0100
Subject: [PATCH] Fix explode() call in legacy/helper.php to have correct types
Found while enabling strict_typing for PHP7+.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
lib/private/legacy/helper.php | 4 ++--
1 file 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;
--
GitLab