summaryrefslogtreecommitdiffstats
path: root/lib/config.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-07-05 15:07:15 +0200
committerRobin Appelman <icewind@owncloud.com>2013-07-05 15:07:15 +0200
commitc1cf829b9d3b54b9a798a30ee10d3c496f871958 (patch)
treef7e9b55f41b7293470d417f05247728c305a11b7 /lib/config.php
parent63c83ff50bc8329d4fea4c09d724d7d944ddcb1d (diff)
downloadnextcloud-server-c1cf829b9d3b54b9a798a30ee10d3c496f871958.tar.gz
nextcloud-server-c1cf829b9d3b54b9a798a30ee10d3c496f871958.zip
OC_Config: handle failure of glob('*.config.php')
Diffstat (limited to 'lib/config.php')
-rw-r--r--lib/config.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/config.php b/lib/config.php
index fcd0a9d7c3c..f1c139f22b1 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -132,6 +132,9 @@ class OC_Config{
// read all file in config dir ending by config.php
$config_files = glob( OC::$SERVERROOT."/config/*.config.php");
+ if (!is_array($config_files)) {
+ $config_files = array();
+ }
//Filter only regular files
$config_files = array_filter($config_files, 'is_file');