diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-09 23:14:52 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-09 23:14:52 -0800 |
| commit | 841c62208551425361f311969260e95eded9101a (patch) | |
| tree | 3230ef5998b0c94ac976399dc3bbf8077bd21548 /lib | |
| parent | a8f6a2446c37b59a9406f55f43ad76248293e83f (diff) | |
| parent | 4f24d4ba015bb442e86449c0ebde51352fa037ab (diff) | |
| download | nextcloud-server-841c62208551425361f311969260e95eded9101a.tar.gz nextcloud-server-841c62208551425361f311969260e95eded9101a.zip | |
Merge pull request #5687 from owncloud/fixing-5659-master
display the exception instead of meaningless message
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/base.php b/lib/base.php index 4f8d97ac95d..81e0f77aa80 100644 --- a/lib/base.php +++ b/lib/base.php @@ -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(); |