nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-03-06 08:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Removed use of GLOB_BRACE as doesn't work on some systems, use non-GLOB_BRACE method instead. Thanks [xming] and Risk64. Should resolve Issue 916, as well.

Browse Source
This commit is contained in:
Nate Jones
2015-05-12 18:11:05 +00:00
parent acaac84edc
commit fe8032b1c3
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/require.php
View File

@@ -48,16 +48,11 @@
spl_autoload_register(array($this, 'loader'));
}
private function loader($class_name) {
//use glob to check "/resources/classes", "/{core,app}/*/resources/classes";
if (defined("GLOB_BRACE")) {
$results = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "{/*/*,}/resources/classes/".$class_name.".php", GLOB_BRACE);
}
else {
$array_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
$array_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
$results = array_merge((array)$array_1,(array)$array_2);
unset($array_1, $array_2);
}
//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);
//include the class
foreach ($results as &$class_file) {