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

Refs #3132 This doesn't seem to be enough yet

git-svn-id: http://dev.piwik.org/svn/trunk@6428 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 5c488f12
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -21,5 +21,5 @@ final class Piwik_Version ...@@ -21,5 +21,5 @@ final class Piwik_Version
* Current Piwik version * Current Piwik version
* @var string * @var string
*/ */
const VERSION = '1.8-rc5'; const VERSION = '1.8-rc6';
} }
...@@ -97,7 +97,7 @@ class Piwik_ImageGraph_API ...@@ -97,7 +97,7 @@ class Piwik_ImageGraph_API
public function get($idSite, $period, $date, $apiModule, $apiAction, $graphType = false, public function get($idSite, $period, $date, $apiModule, $apiAction, $graphType = false,
$outputType = Piwik_ImageGraph_API::GRAPH_OUTPUT_INLINE, $column = false, $showMetricTitle = true, $outputType = Piwik_ImageGraph_API::GRAPH_OUTPUT_INLINE, $column = false, $showMetricTitle = true,
$width = false, $height = false, $fontSize = Piwik_ImageGraph_API::DEFAULT_FONT_SIZE, $aliasedGraph = true, $width = false, $height = false, $fontSize = Piwik_ImageGraph_API::DEFAULT_FONT_SIZE, $aliasedGraph = true,
$colors = false) $idGoal = false, $colors = false)
{ {
Piwik::checkUserHasViewAccess($idSite); Piwik::checkUserHasViewAccess($idSite);
...@@ -257,10 +257,9 @@ class Piwik_ImageGraph_API ...@@ -257,10 +257,9 @@ class Piwik_ImageGraph_API
$apiAction, $apiAction,
$segment = false, $segment = false,
$apiParameters = false, $apiParameters = false,
$idGoal = false, $idGoal,
$languageLoaded $languageLoaded
); );
// prepare abscissa and ordinate series // prepare abscissa and ordinate series
$abscissaSerie = array(); $abscissaSerie = array();
$ordinateSerie = array(); $ordinateSerie = array();
...@@ -381,9 +380,6 @@ class Piwik_ImageGraph_API ...@@ -381,9 +380,6 @@ class Piwik_ImageGraph_API
switch($outputType) switch($outputType)
{ {
case self::GRAPH_OUTPUT_FILE: case self::GRAPH_OUTPUT_FILE:
// adding the idGoal to the filename
$idGoal = Piwik_Common::getRequestVar('idGoal', '', 'string');
if($idGoal != '') if($idGoal != '')
{ {
$idGoal = '_' . $idGoal; $idGoal = '_' . $idGoal;
......
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