Skip to content
Extraits de code Groupes Projets
Valider dac2d849 rédigé par robocoder's avatar robocoder
Parcourir les fichiers

fixes #2806, refs #2809 - quick fix

git-svn-id: http://dev.piwik.org/svn/trunk@5508 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 429525c9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -82,7 +82,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer ...@@ -82,7 +82,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
return 'No data available'; return 'No data available';
} }
self::renderHeader($this); self::renderHeader(/*$this*/);
if($this->convertToUnicode if($this->convertToUnicode
&& function_exists('mb_convert_encoding')) && function_exists('mb_convert_encoding'))
...@@ -373,8 +373,10 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer ...@@ -373,8 +373,10 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
return $value; return $value;
} }
protected static function renderHeader($instance) protected static function renderHeader(/*$instance*/)
{ {
// @todo http://dev.piwik.org/trac/ticket/2809
/*
$fileName = 'Piwik '.Piwik_Translate('General_Export'); $fileName = 'Piwik '.Piwik_Translate('General_Export');
$period = Piwik_Common::getRequestVar('period', false); $period = Piwik_Common::getRequestVar('period', false);
...@@ -401,11 +403,12 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer ...@@ -401,11 +403,12 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
$fileName .= ' _ '.$meta['name'] $fileName .= ' _ '.$meta['name']
.' _ '.$prettyDate.'.csv'; .' _ '.$prettyDate.'.csv';
} }
*/
$fileName = 'piwik-report-export.csv';
// silent fail otherwise unit tests fail // silent fail otherwise unit tests fail
@header('Content-Type: application/vnd.ms-excel'); @header('Content-Type: application/vnd.ms-excel');
@header('Content-Disposition: attachment; filename="'.$fileName.'"'); @header('Content-Disposition: attachment; filename="'.$fileName.'"');
Piwik::overrideCacheControlHeaders(); Piwik::overrideCacheControlHeaders();
} }
} }
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter