diff --git a/core/Version.php b/core/Version.php index f6eac673203b4c0a19b472d3eb7a6be36241dfcc..f2198426c551505fa5b0a15c9c216934fd5ebd7e 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Piwik_Version * Current Piwik version * @var string */ - const VERSION = '1.8-rc5'; + const VERSION = '1.8-rc6'; } diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index 8a02667fcd0088f45015af0590815a67bf0c497a..e7be4cb61843ed941b2acef718728ec30b84aff0 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -97,7 +97,7 @@ class Piwik_ImageGraph_API public function get($idSite, $period, $date, $apiModule, $apiAction, $graphType = false, $outputType = Piwik_ImageGraph_API::GRAPH_OUTPUT_INLINE, $column = false, $showMetricTitle = true, $width = false, $height = false, $fontSize = Piwik_ImageGraph_API::DEFAULT_FONT_SIZE, $aliasedGraph = true, - $colors = false) + $idGoal = false, $colors = false) { Piwik::checkUserHasViewAccess($idSite); @@ -257,10 +257,9 @@ class Piwik_ImageGraph_API $apiAction, $segment = false, $apiParameters = false, - $idGoal = false, + $idGoal, $languageLoaded ); - // prepare abscissa and ordinate series $abscissaSerie = array(); $ordinateSerie = array(); @@ -381,9 +380,6 @@ class Piwik_ImageGraph_API switch($outputType) { case self::GRAPH_OUTPUT_FILE: - - // adding the idGoal to the filename - $idGoal = Piwik_Common::getRequestVar('idGoal', '', 'string'); if($idGoal != '') { $idGoal = '_' . $idGoal;