From c9a41c19a02e5db14a1632076d74ab091441e07b Mon Sep 17 00:00:00 2001
From: vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>
Date: Thu, 23 Jul 2009 23:10:23 +0000
Subject: Fixes #876 - Piwik_Tracker_Visit should not validate uninitialized
 $this->request in constructor; make it possible to push data (in the absence
 of a REST API; see #134); fix duplicate function error messages when calling
 Piwik::printSqlProfilingReportTracker() more than once

---
 piwik.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'piwik.php')

diff --git a/piwik.php b/piwik.php
index 44d47005c3..c9386a0ed3 100644
--- a/piwik.php
+++ b/piwik.php
@@ -8,14 +8,13 @@
  */
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; 
-if(defined('PIWIK_ENABLE_TRACKING') && !PIWIK_ENABLE_TRACKING)
-{
-	return;
-}
 
 define('PIWIK_TRACKER_MODE', true);
 error_reporting(E_ALL|E_NOTICE);
-define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+if(!defined('PIWIK_INCLUDE_PATH'))
+{
+	define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+}
 @ignore_user_abort(true);
 
 if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
@@ -43,8 +42,8 @@ session_cache_limiter('nocache');
 ob_start();
 if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 {	
-    require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
 	@date_default_timezone_set(date_default_timezone_get());
+	require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
 	require_once PIWIK_INCLUDE_PATH .'/core/ErrorHandler.php';
 	require_once PIWIK_INCLUDE_PATH .'/core/ExceptionHandler.php';
 	set_error_handler('Piwik_ErrorHandler');
@@ -55,7 +54,10 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 	Piwik::createLogObject();
 }
 
-$process = new Piwik_Tracker();
-$process->main();
-ob_end_flush();
-printDebug($_COOKIE);
+if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
+{
+	$process = new Piwik_Tracker();
+	$process->main();
+	ob_end_flush();
+	printDebug($_COOKIE);
+}
-- 
cgit v1.2.3