Parcourir la source

Replace GLOB_BRACE as its not supported by all systems.

FusionPBX il y a 2 ans
Parent
commit
8edea1203a
1 fichiers modifiés avec 12 ajouts et 1 suppressions
  1. 12 1
      resources/classes/database.php

+ 12 - 1
resources/classes/database.php

@@ -2933,7 +2933,18 @@
 					$schema = self::sanitize($schema);
 					$schema = self::sanitize($schema);
 
 
 				//get the apps array
 				//get the apps array
-					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/{core,app}/{".$schema.",".self::singular($schema)."}/app_config.php", GLOB_BRACE);
+					$config_list = [];
+					$directories = ["core", "app"];
+					$applications = [$schema, self::singular($schema)];
+					foreach ($directories as $directory) {
+						foreach ($applications as $application) {
+							$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/$directory/$application/app_config.php";
+							$app_config_files = glob($path);
+							if ($app_config_files !== false) {
+								$config_list = array_merge($config_list, $app_config_files);
+							}
+						}
+					}
 					$x = 0;
 					$x = 0;
 					foreach ($config_list as &$config_path) {
 					foreach ($config_list as &$config_path) {
 						include($config_path);
 						include($config_path);