return;
}
- $logmsg = "PEAR error: " . $error->getMessage();
+ $logmsg = "Exception thrown: " . _ve($error->getMessage());
if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
- $logmsg .= " : ". $error->toText();
+ $logmsg .= " PEAR: ". $error->toText();
}
// DB queries often end up with a lot of newlines; merge to a single line
// for easier grepability...
$args = $r->map($path);
- $site_ssl = common_config('site', 'ssl');
-
// If the request is HTTP and it should be HTTPS...
- if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
+ if (GNUsocial::useHTTPS() && !GNUsocial::isHTTPS()) {
common_redirect(common_local_url($args['action'], $args));
}