set DEBUG from xdebug session before we first use it

diff --git a/lib/base.php b/lib/base.php
index ba77d0a618990e3519e228f85333930b37c3f9c4..b5439c00abfcd9afc2eae23415e985d88f3c8577 100644 (file)
--- 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');