Merge pull request #5687 from owncloud/fixing-5659-master

display the exception instead of meaningless message
This commit is contained in:
Thomas Müller 2013-11-09 23:14:52 -08:00
commit 841c622085
1 changed files with 3 additions and 8 deletions

View File

@ -308,14 +308,9 @@ class OC {
self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
// if session cant be started break with http 500 error
} catch (Exception $e) {
OC_Log::write('core', 'Session could not be initialized. Exception message: '.$e->getMessage(),
OC_Log::ERROR);
header('HTTP/1.1 500 Internal Server Error');
OC_Util::addStyle("styles");
$error = 'Session could not be initialized. Please contact your ';
$error .= 'system administrator.';
OC_Template::printErrorPage($error);
//show the user a detailed error page
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
OC_Template::printExceptionErrorPage($e);
}
$sessionLifeTime = self::getSessionLifeTime();