diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-07-05 15:07:15 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-07-05 15:07:15 +0200 |
commit | c1cf829b9d3b54b9a798a30ee10d3c496f871958 (patch) | |
tree | f7e9b55f41b7293470d417f05247728c305a11b7 /lib/config.php | |
parent | 63c83ff50bc8329d4fea4c09d724d7d944ddcb1d (diff) | |
download | nextcloud-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.php | 3 |
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'); |