From e3677583a96ac5e87f5a22ef8685f7c36cf80c88 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Tue, 12 Apr 2016 16:02:13 +1200
Subject: fix tests (#10040)

---
 plugins/Goals/Goals.php | 7 ++++++-
 plugins/Goals/Menu.php  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'plugins/Goals')

diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 1f9d229428..ae9ea61cda 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -90,7 +90,12 @@ class Goals extends \Piwik\Plugin
         $idSite = Common::getRequestVar('idSite', 0, 'int');
 
         if (!$idSite) {
-            return;
+            // fallback for eg API.getReportMetadata which uses idSites
+            $idSite = Common::getRequestVar('idSites', 0, 'int');
+
+            if (!$idSite) {
+                return;
+            }
         }
 
         $goals = API::getInstance()->getGoals($idSite);
diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php
index 4d5f60a937..542eba461b 100644
--- a/plugins/Goals/Menu.php
+++ b/plugins/Goals/Menu.php
@@ -21,7 +21,7 @@ class Menu extends \Piwik\Plugin\Menu
         $idSite = $this->getIdSite($userPreferences->getDefaultWebsiteId());
 
         if (Piwik::isUserHasAdminAccess($idSite)) {
-            $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 15);
+            $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 40);
         }
     }
 
-- 
cgit v1.2.3