From 449daffbeff8c62b8f921bc351cfd57f0e01a83d Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 27 Dec 2014 17:28:07 +0000 Subject: [PATCH] Change the | to a comma had to review the syntax on the glob command. --- resources/classes/domains.php | 4 ++-- resources/classes/menu.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/classes/domains.php b/resources/classes/domains.php index 23be0d3fb5..778d43dfa8 100644 --- a/resources/classes/domains.php +++ b/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); diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 8d2e2705b6..93a2af6f0e 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"); $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;