diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index c5c8a962c9..53b120d613 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1307,8 +1307,8 @@
function __autoload($class)
{
$components = explode('_',$class);
- $app =array_shift($components);
- $baseclass = implode('_', $components);
+ $app = array_shift($components);
+ $baseclass = $components[0];
// classes using the new naming schema app_class_name, eg. admin_cmd
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
@@ -1324,9 +1324,13 @@ function __autoload($class)
{
//error_log("autoloaded class $class from $file");
include_once($file);
- } else {
- foreach($GLOBALS['egw_info']['apps'] as $lapp=>$appvalue){
- if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$lapp.'/inc/class.'.$class.'.inc.php')){
+ }
+ else
+ {
+ foreach($GLOBALS['egw_info']['apps'] as $lapp => $appvalue)
+ {
+ if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$lapp.'/inc/class.'.$class.'.inc.php'))
+ {
#echo "$lapp,$class
";
include_once($file);
}
@@ -1355,13 +1359,22 @@ function egw_exception_handler(Exception $e)
{
$headline = lang('An error happend');
}
- $GLOBALS['egw']->framework->render(
- ''.$headline."
\n".
+ $message = ''.$headline."
\n".
''.$e->getMessage()."\n\n".
- $e->getTraceAsString()."
\n".
- ''.lang('Click here to resume your eGroupWare Session.').'',
- $headline);
+ $e->getTraceAsString()."\n";
+ if (is_object($GLOBALS['egw']) && is_object($GLOBALS['egw']->session))
+ {
+ '
'.lang('Click here to resume your eGroupWare Session.').'
';
+ }
+ if (is_object($GLOBALS['egw']) && is_object($GLOBALS['egw']->framework))
+ {
+ $GLOBALS['egw']->framework->render($message,$headline);
+ }
+ else
+ {
+ echo "\n\n$headline\n\n\n$message\n\n\n";
+ }
$GLOBALS['egw']->common->egw_exit();
}