From fae33c78c9f3051a9f5f3a0fb41912ae37038dee Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Fri, 1 Jun 2012 01:00:46 +0000
Subject: [PATCH] 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
---
core/Version.php | 2 +-
plugins/ImageGraph/API.php | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/core/Version.php b/core/Version.php
index f6eac67320..f2198426c5 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 8a02667fcd..e7be4cb618 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;
--
GitLab