浏览代码

Change the | to a comma had to review the syntax on the glob command.

Mark Crane 10 年之前
父节点
当前提交
3e69c5fcb1
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      resources/classes/domains.php
  2. 2 2
      resources/classes/menu.php

+ 2 - 2
resources/classes/domains.php

@@ -230,8 +230,8 @@
 			//get the PROJECT PATH
 				include "root.php";
 
-			//get the list of installed apps from the core and mod directories
-				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.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");
 				$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");
 					$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");
 					$x = 0;
 					foreach ($config_list as &$config_path) {
 						$y = 0;