From da610b8e9a75aaf81615a2b36e0b7611da2ea19c Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 2 Dec 2014 22:31:07 +0000 Subject: [PATCH] Support autoload of classes for applications with underscore in their name --- phpgwapi/inc/common_functions.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index b0c75794b5..559c27499a 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -1630,6 +1630,9 @@ function __autoload($class) if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php') || // classes using the new naming schema app_class_name, eg. admin_cmd isset($components[0]) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$app.'_'.$components[0].'.inc.php') || + // classes with an underscore in their name + !isset($GLOBALS['egw_info']['apps'][$app]) && isset($GLOBALS['egw_info']['apps'][$app . '_' . $components[0]]) && file_exists($file = +EGW_INCLUDE_ROOT.'/'.$app.'_'.$components[0].'/inc/class.'.$class.'.inc.php') || // eGW api classes using the old naming schema, eg. html file_exists($file = EGW_API_INC.'/class.'.$class.'.inc.php') || // eGW api classes containing multiple classes in on file, eg. egw_exception