fixes #1760, fixes #1573

git-svn-id: http://dev.piwik.org/svn/trunk@3240 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 15 insertions, 4 deletions

diff --git a/piwik.php b/piwik.php
index 9f6bb7ec55..04e5028afb 100644
--- a/piwik.php
+++ b/piwik.php
@@ -69,8 +69,19 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 
 if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
 {
-	$process = new Piwik_Tracker();
-	$process->main();
-	ob_end_flush();
-	printDebug($_COOKIE);
+	try {
+		$process = new Piwik_Tracker();
+		$process->main();
+		ob_end_flush();
+		printDebug($_COOKIE);
+	} catch (Exception $e) {
+		if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
+		{
+			throw $e;
+		}
+		else
+		{
+			error_log($e->getMessage(), 0);
+		}
+	}
 }