set DEBUG from xdebug session before we first use it
This commit is contained in:
parent
bcabdd7dd5
commit
0395715348
12
lib/base.php
12
lib/base.php
|
@ -424,12 +424,6 @@ class OC {
|
||||||
|
|
||||||
self::initPaths();
|
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
|
// set debug mode if an xdebug session is active
|
||||||
if (!defined('DEBUG') || !DEBUG) {
|
if (!defined('DEBUG') || !DEBUG) {
|
||||||
if (isset($_COOKIE['XDEBUG_SESSION'])) {
|
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
|
// register the stream wrappers
|
||||||
stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir');
|
stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir');
|
||||||
stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
|
stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
|
||||||
|
|
Loading…
Reference in New Issue