Merge pull request #3957 from owncloud/config-glob-fail

OC_Config: handle failure of glob('*.config.php')
2013-07-05 07:38:04 -07:00 · 2013-07-05 07:38:04 -07:00 · f8dae11a23
parent 87063918f2 c1cf829b9d
commit f8dae11a23
1 changed files with 3 additions and 0 deletions
--- 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');