GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

better handling of PEAR errors

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-14 14:01:11 -07:00
parent 7f76c36f24
commit 9addfeacfd
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.php
View File

@ -48,13 +48,18 @@ function handleError($error)
$logmsg .= " : ". $error->getDebugInfo(); $logmsg .= " : ". $error->getDebugInfo();
} }
common_log(LOG_ERR, $logmsg); common_log(LOG_ERR, $logmsg);
$msg = sprintf(_('The database for %s isn\'t responding correctly, '. if ($error instanceof DB_DataObject_Error) {
'so the site won\'t work properly. '. $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
'The site admins probably know about the problem, '. 'so the site won\'t work properly. '.
'but you can contact them at %s to make sure. '. 'The site admins probably know about the problem, '.
'Otherwise, wait a few minutes and try again.'), 'but you can contact them at %s to make sure. '.
common_config('site', 'name'), 'Otherwise, wait a few minutes and try again.'),
common_config('site', 'email')); common_config('site', 'name'),
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();
@ -70,7 +75,7 @@ function main()
global $user, $action, $config; global $user, $action, $config;
Snapshot::check(); Snapshot::check();
if (!_have_config()) { if (!_have_config()) {
$msg = sprintf(_("No configuration file found. Try running ". $msg = sprintf(_("No configuration file found. Try running ".
"the installation program first.")); "the installation program first."));