diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php index 6f96884a69..dae83fd274 100644 --- a/core/upgrade/app_languages.php +++ b/core/upgrade/app_languages.php @@ -264,7 +264,7 @@ $text['header-database_type']['pt-br'] = "Tipo de base de dados"; $text['header-database_type']['pl'] = "Rodzaj bazy danych"; $text['header-database_type']['sv-se'] = "Databas Typ"; -$text['description-upgrade_svn']['en-us'] = "Updates FusionPBX source files and scripts from the respository."; +$text['description-upgrade_svn']['en-us'] = "Updates FusionPBX source files from the respository."; $text['description-upgrade_svn']['es-cl'] = "Archivos de origen Actualizaciones FusionPBX del repositorio."; $text['description-upgrade_svn']['pt-pt'] = "Arquivos de origem Atualizações FusionPBX do repositório."; $text['description-upgrade_svn']['fr-fr'] = "Fichiers sources des mises à jour FusionPBX du respository."; diff --git a/resources/classes/domains.php b/resources/classes/domains.php index fb413b8550..c3dfdeff84 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -221,10 +221,10 @@ include "root.php"; //get the list of installed apps from the core and app directories (note: GLOB_BRACE doesn't work on some systems) - $config_list1 = glob($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/*/*/app_config.php"); - $config_list2 = glob($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/*/*/app_menu.php"); - $config_list = array_merge((array)$config_list1, (array)$config_list2); - unset($config_list1,$config_list2); + $config_list_1 = glob($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/*/*/app_config.php"); + $config_list_2 = glob($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/*/*/app_menu.php"); + $config_list = array_merge((array)$config_list_1, (array)$config_list_2); + unset($config_list_1,$config_list_2); $x=0; foreach ($config_list as &$config_path) { include($config_path); diff --git a/resources/require.php b/resources/require.php index 364e11762d..19a5a8edcc 100644 --- a/resources/require.php +++ b/resources/require.php @@ -49,10 +49,10 @@ } private function loader($class_name) { //use glob to get classes (note: GLOB_BRACE doesn't work on some systems) - $results1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php"); - $results2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"); - $results = array_merge((array)$results1,(array)$results2); - unset($results1, $results2); + $results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php"); + $results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"); + $results = array_merge((array)$results_1,(array)$results_2); + unset($results_1, $results_2); //include the class foreach ($results as &$class_file) {