fixes #2809, refs #2714: making signature of...

fixes #2809, refs #2714: making signature of Piwik_DataTable_Renderer::renderHeader() compatible across subclasses

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

core/DataTable/Renderer.php

@@ -79,8 +79,11 @@ abstract class Piwik_DataTable_Renderer
 
 	/**
 	 * Output HTTP Content-Type header
+	 * @param Piwik_DataTable_Renderer $instance
+	 * 			can be used to access the configuration of the current instance
+	 * 			(used in subclass Piwik_DataTable_Renderer_Csv)
 	 */
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: text/html; charset=utf-8');
 	}

core/DataTable/Renderer/Csv.php

@@ -82,7 +82,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 			return 'No data available';
 		}
 
-		self::renderHeader(/*$this*/);
+		self::renderHeader($this);
 
 		if($this->convertToUnicode 
 			&& function_exists('mb_convert_encoding'))
@@ -373,10 +373,8 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 		return $value;
 	}
 	
-	protected static function renderHeader(/*$instance*/)
+	protected static function renderHeader($instance=null)
 	{
-// @todo http://dev.piwik.org/trac/ticket/2809
-/*
 		$fileName = 'Piwik '.Piwik_Translate('General_Export');
 		
 		$period = Piwik_Common::getRequestVar('period', false);
@@ -403,8 +401,6 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 			$fileName .= ' _ '.$meta['name']
 					.' _ '.$prettyDate.'.csv';
 		}
-*/
-		$fileName = 'piwik-report-export.csv';
 
 		// silent fail otherwise unit tests fail
 		@header('Content-Type: application/vnd.ms-excel');

core/DataTable/Renderer/Json.php

@@ -74,7 +74,7 @@ class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer
 		return $str;
 	}
 	
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: application/json; charset=utf-8');
 		Piwik::overrideCacheControlHeaders();

core/DataTable/Renderer/Rss.php

@@ -78,7 +78,7 @@ class Piwik_DataTable_Renderer_Rss extends Piwik_DataTable_Renderer
 		return $header . $out . $footer;
 	}
 
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: text/xml; charset=utf-8');
 	}

core/DataTable/Renderer/Xml.php

@@ -335,7 +335,7 @@ class Piwik_DataTable_Renderer_Xml extends Piwik_DataTable_Renderer
 		return $out;
 	}
 	
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		// silent fail because otherwise it throws an exception in the unit tests
 		@header('Content-Type: text/xml; charset=utf-8');