From d34fbd106336dcc1316b84e1bfb427cff024183d Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 27 Dec 2014 17:30:07 +0000 Subject: [PATCH] Need to add GLOB_BRACE to support the {menu,config} --- resources/classes/domains.php | 2 +- resources/classes/menu.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/classes/domains.php b/resources/classes/domains.php index 778d43dfa8..553155c3ae 100644 --- a/resources/classes/domains.php +++ b/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); diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 93a2af6f0e..cce93300a9 100644 --- a/resources/classes/menu.php +++ b/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;