Kaynağa Gözat

Need to add GLOB_BRACE to support the {menu,config}

Mark Crane 10 yıl önce
ebeveyn
işleme
00314568de
2 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 1 1
      resources/classes/domains.php
  2. 2 2
      resources/classes/menu.php

+ 1 - 1
resources/classes/domains.php

@@ -231,7 +231,7 @@
 				include "root.php";
 
 			//get the list of installed apps from the core and app directories
-				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php");
+				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php",GLOB_BRACE);
 				$x=0;
 				foreach ($config_list as &$config_path) {
 					include($config_path);

+ 2 - 2
resources/classes/menu.php

@@ -51,7 +51,7 @@
 					$db = $this->db;
 
 				//get the $apps array from the installed apps from the core and mod directories
-					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php");
+					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php",GLOB_BRACE);
 					$x = 0;
 					foreach ($config_list as &$config_path) {
 						$y = 0;
@@ -211,7 +211,7 @@
 					$db->beginTransaction();
 
 				//get the $apps array from the installed apps from the core and mod directories
-					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php");
+					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_{config,menu}.php",GLOB_BRACE);
 					$x = 0;
 					foreach ($config_list as &$config_path) {
 						$y = 0;