better handling of PEAR errors

This commit is contained in:
Evan Prodromou 2009-06-14 14:01:11 -07:00
parent 7f76c36f24
commit 9addfeacfd

View File

@ -48,6 +48,7 @@ function handleError($error)
$logmsg .= " : ". $error->getDebugInfo(); $logmsg .= " : ". $error->getDebugInfo();
} }
common_log(LOG_ERR, $logmsg); common_log(LOG_ERR, $logmsg);
if ($error instanceof DB_DataObject_Error) {
$msg = sprintf(_('The database for %s isn\'t responding correctly, '. $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
'so the site won\'t work properly. '. 'so the site won\'t work properly. '.
'The site admins probably know about the problem, '. 'The site admins probably know about the problem, '.
@ -55,6 +56,10 @@ function handleError($error)
'Otherwise, wait a few minutes and try again.'), 'Otherwise, wait a few minutes and try again.'),
common_config('site', 'name'), common_config('site', 'name'),
common_config('site', 'email')); common_config('site', 'email'));
} else {
$msg = _('An important error occured, probably related to email setup. '.
'Check logfiles for more info..');
}
$dac = new DBErrorAction($msg, 500); $dac = new DBErrorAction($msg, 500);
$dac->showPage(); $dac->showPage();