function getPath($req)
{
- if (common_config('site', 'fancy')) {
+ if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
+ && array_key_exists('p', $req)) {
return $req['p'];
- } else if ($_SERVER['PATH_INFO']) {
+ } else if (array_key_exists('PATH_INFO', $_SERVER)) {
return $_SERVER['PATH_INFO'];
} else {
- return $req['p'];
+ return null;
}
}
return;
}
- common_log(LOG_ERR, "PEAR error: " . $error->getMessage());
+ $logmsg = "PEAR error: " . $error->getMessage();
+ if(common_config('site', 'logdebug')) {
+ $logmsg .= " : ". $error->getDebugInfo();
+ }
+ common_log(LOG_ERR, $logmsg);
$msg = sprintf(_('The database for %s isn\'t responding correctly, '.
'so the site won\'t work properly. '.
'The site admins probably know about the problem, '.
{
global $user, $action;
+ if (!_have_config()) {
+ $msg = sprintf(_("No configuration file found. Try running ".
+ "the installation program first."));
+ $sac = new ServerErrorAction($msg);
+ $sac->showPage();
+ return;
+ }
+
// For database errors
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
// XXX: find somewhere for this little block to live
- if ($config['db']['mirror'] && $action_obj->isReadOnly()) {
- if (is_array($config['db']['mirror'])) {
+ if (common_config('db', 'mirror') && $action_obj->isReadOnly()) {
+ if (is_array(common_config('db', 'mirror'))) {
// "load balancing", ha ha
$k = array_rand($config['db']['mirror']);