refs #6511 this should fix sitesearch reports are not available in scheduled report as there was no siteid set

2 files changed, 27 insertions, 3 deletions

diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php
index 5acf9e93ae..e78590c074 100644
--- a/plugins/Actions/Reports/GetSiteSearchCategories.php
+++ b/plugins/Actions/Reports/GetSiteSearchCategories.php
@@ -27,9 +27,9 @@ class GetSiteSearchCategories extends SiteSearchBase
         $this->widgetTitle  = 'Actions_WidgetSearchCategories';
     }
 
-    public function isEnabled()
+    protected function isEnabledForIdSites($idSites)
     {
-        return parent::isEnabled() && Actions::isCustomVariablesPluginsEnabled();
+        return parent::isEnabledForIdSites($idSites) && Actions::isCustomVariablesPluginsEnabled();
     }
 
     public function getMetrics()
diff --git a/plugins/Actions/Reports/SiteSearchBase.php b/plugins/Actions/Reports/SiteSearchBase.php
index 5212732e49..5b958f442d 100644
--- a/plugins/Actions/Reports/SiteSearchBase.php
+++ b/plugins/Actions/Reports/SiteSearchBase.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Actions\Reports;
 
+use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Actions;
@@ -22,8 +23,31 @@ abstract class SiteSearchBase extends Base
 
     public function isEnabled()
     {
+        $idSites = Common::getRequestVar('idSites', '', 'string');
+        $idSite  = Common::getRequestVar('idSite', 0, 'int');
+
+        return $this->isEnabledForIdSites($idSites, $idSite);
+    }
+
+    protected function isEnabledForIdSites($idSites, $idSite = 0)
+    {
         $actions = new Actions();
-        return $actions->isSiteSearchEnabled();
+        return $actions->isSiteSearchEnabled($idSites, $idSite);
+    }
+
+    public function configureReportMetadata(&$availableReports, $infos)
+    {
+        $idSites = !empty($infos['idSites']) ? $infos['idSites'] : array();
+
+        if (!$this->isEnabledForIdSites($idSites)) {
+            return;
+        }
+
+        $report = $this->buildReportMetadata();
+
+        if (!empty($report)) {
+            $availableReports[] = $report;
+        }
     }
 
     protected function addSiteSearchDisplayProperties(ViewDataTable $view)