diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 07:38:04 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 07:38:04 -0700 |
| commit | f8dae11a23784bc9ebdef67511934630e46f870b (patch) | |
| tree | 1daac870988c5866191cd4060887b7f0ad51843e | |
| parent | 87063918f223bcab956bd19fe0845ca1e28e9013 (diff) | |
| parent | c1cf829b9d3b54b9a798a30ee10d3c496f871958 (diff) | |
| download | nextcloud-server-f8dae11a23784bc9ebdef67511934630e46f870b.tar.gz nextcloud-server-f8dae11a23784bc9ebdef67511934630e46f870b.zip | |
Merge pull request #3957 from owncloud/config-glob-fail
OC_Config: handle failure of glob('*.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'); |