mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23032 from owncloud/basephp-showclierror 

Do not set response status in CLI in case of error
This commit is contained in:
Thomas Müller 2016-03-09 16:42:51 +01:00
parent 0cc53ee06d 12b2192038
commit 2098573614
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base.php
View File

@ -509,7 +509,9 @@ class OC {
require_once $vendorAutoLoad; require_once $vendorAutoLoad;
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); if (!self::$CLI) {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
}
// we can't use the template error page here, because this needs the // we can't use the template error page here, because this needs the
// DI container which isn't available yet // DI container which isn't available yet
print($e->getMessage()); print($e->getMessage());