From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Feb 2013 02:15:09 +0000 (+0100)
Subject: set DEBUG from xdebug session before we first use it
X-Git-Tag: v5.0.0beta1~37^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0395715348de9cfddcd3d7666479ee0fcb554357;p=nextcloud-server.git

set DEBUG from xdebug session before we first use it
---

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');