From dbe8a799d7e7fc8417b13ac8838f963d6187a5dc Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Mon, 24 Mar 2014 23:06:02 +0100
Subject: refs #4780 added possibility to enable tracker debug via config, use
 logger for printing debug messages which allows users to log to screen, file
 or db

---
 piwik.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'piwik.php')

diff --git a/piwik.php b/piwik.php
index 539b0d40a6..a123987a26 100644
--- a/piwik.php
+++ b/piwik.php
@@ -12,7 +12,6 @@ use Piwik\Common;
 use Piwik\Timer;
 use Piwik\Tracker;
 
-$GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false;
 define('PIWIK_ENABLE_TRACKING', true);
 
@@ -84,6 +83,9 @@ if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
     ob_start();
 }
 
+\Piwik\FrontController::createConfigObject();
+
+$GLOBALS['PIWIK_TRACKER_DEBUG'] = \Piwik\Config::getInstance()->Tracker['debug'];
 if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
     require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
 
@@ -93,10 +95,10 @@ if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
     \Piwik\ExceptionHandler::setUp();
 
     $timer = new Timer();
-    Common::printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true));
+    Common::printDebug("Debug enabled - Input parameters: ");
+    Common::printDebug(var_export($_GET, true));
 
     \Piwik\Tracker\Db::enableProfiling();
-    \Piwik\FrontController::createConfigObject();
 }
 
 if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
-- 
cgit v1.2.3