From b7b6075d55abdf656128c0044d6649c976e40a00 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 10 Jun 2013 11:42:20 -0400
Subject: [PATCH] Fix potential glob error
---
lib/config.php | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/lib/config.php b/lib/config.php
index a609529645..4003339ea5 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -122,21 +122,17 @@ class Config {
* Reads the config file and saves it to the cache
*/
private function readData() {
- // read all file in config dir ending by config.php
- $configFiles = glob($this->configDir.'*.config.php');
-
- //Filter only regular files
- $configFiles = array_filter($configFiles, 'is_file');
-
- //Sort array naturally :
- natsort($configFiles);
-
- // Add default config
- array_unshift($configFiles, $this->configFilename);
-
- //Include file and merge config
+ // Default config
+ $configFiles = array($this->configFilename);
+ // Add all files in the config dir ending with config.php
+ $extra = glob($this->configDir.'*.config.php');
+ if (is_array($extra)) {
+ natsort($extra);
+ $configFiles = array_merge($configFiles, $extra);
+ }
+ // Include file and merge config
foreach ($configFiles as $file) {
- if (!file_exists($file)) {
+ if (!is_file($file)) {
continue;
}
unset($CONFIG);
--
GitLab