fixes #2252

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

piwik.php

@@ -49,7 +49,6 @@ require_once PIWIK_INCLUDE_PATH .'/core/CacheFile.php';
 require_once PIWIK_INCLUDE_PATH .'/core/Cookie.php';
 
 session_cache_limiter('nocache');
-ob_start();
 @date_default_timezone_set('UTC');
 if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 {	
@@ -72,6 +71,7 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 
 if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
 {
+	ob_start();
 	$process = new Piwik_Tracker();
 	$process->main();
 	ob_end_flush();

tests/core/ReleaseCheckList.test.php

@@ -85,7 +85,8 @@ class Test_Piwik_ReleaseCheckList extends UnitTestCase
 		// hiding echoed out message on empty request
 		ob_start();
 		include PIWIK_PATH_TEST_TO_ROOT . "/piwik.php";
-		ob_clean();
+		ob_end_clean();
+
 		$this->assertTrue($GLOBALS['PIWIK_TRACKER_DEBUG'] === false);
 	}