diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-06-09 11:07:10 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-09 11:07:10 +0200 |
| commit | 3239d1099c88b78d57a14e032f15062277aeaee3 (patch) | |
| tree | 70d4b37f83d127ba1d41c1b56be233d8628563d6 | |
| parent | e5c47a5e3022fa835644c2e9e2d24723b93cce7a (diff) | |
| parent | 63c5c7bd21b29bbd7b196fb8db84b6b4e30f294a (diff) | |
| download | nextcloud-server-3239d1099c88b78d57a14e032f15062277aeaee3.tar.gz nextcloud-server-3239d1099c88b78d57a14e032f15062277aeaee3.zip | |
Merge pull request #8948 from owncloud/fix-logger-race-condition
set logger before registrate to an error handler
| -rw-r--r-- | lib/base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 2e65e9f1601..5871ecba839 100644 --- a/lib/base.php +++ b/lib/base.php @@ -515,13 +515,13 @@ class OC { } if (!defined('PHPUNIT_RUN')) { + OC\Log\ErrorHandler::setLogger(OC_Log::$object); if (defined('DEBUG') and DEBUG) { OC\Log\ErrorHandler::register(true); set_exception_handler(array('OC_Template', 'printExceptionErrorPage')); } else { OC\Log\ErrorHandler::register(); } - OC\Log\ErrorHandler::setLogger(OC_Log::$object); } // register the stream wrappers |