diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-02-15 06:15:09 +0400 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-02-15 06:15:09 +0400 |
| commit | 0395715348de9cfddcd3d7666479ee0fcb554357 (patch) | |
| tree | b23c6fd073d781885513c158e5c8a679ac078de6 /lib/base.php | |
| parent | bcabdd7dd56fd11f5afd5f486955627a657c2072 (diff) | |
set DEBUG from xdebug session before we first use it
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index ba77d0a6189..b5439c00abf 100644 --- a/lib/base.php +++ b/lib/base.php @@ -424,12 +424,6 @@ class OC { self::initPaths(); - if (!defined('PHPUNIT_RUN') and !(defined('DEBUG') and DEBUG)) { - register_shutdown_function(array('OC_Log', 'onShutdown')); - set_error_handler(array('OC_Log', 'onError')); - set_exception_handler(array('OC_Log', 'onException')); - } - // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { if (isset($_COOKIE['XDEBUG_SESSION'])) { @@ -437,6 +431,12 @@ class OC { } } + if (!defined('PHPUNIT_RUN') and !(defined('DEBUG') and DEBUG)) { + register_shutdown_function(array('OC_Log', 'onShutdown')); + set_error_handler(array('OC_Log', 'onError')); + set_exception_handler(array('OC_Log', 'onException')); + } + // register the stream wrappers stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir'); stream_wrapper_register('static', 'OC\Files\Stream\StaticStream'); |