Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-03-18 01:50:57 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-03-18 01:50:57 +0400
commit2da1fc778d101d2044d1fd843d18eff7eaa88f7a (patch)
tree158aa539eebf0d396b3b31da31fc97747ae69aee /plugins/Actions/Actions.php
parent7aa287db1cff9e164eb3a16f07e04ffae1443e64 (diff)
fixes #4869 site search was not included in report metadata
Diffstat (limited to 'plugins/Actions/Actions.php')
-rw-r--r--plugins/Actions/Actions.php20
1 files changed, 17 insertions, 3 deletions
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 2256d6334b..30da4b51fd 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -502,11 +502,25 @@ class Actions extends \Piwik\Plugin
protected function isSiteSearchEnabled()
{
- $idSite = Common::getRequestVar('idSite', 0, 'int');
- if ($idSite == 0) {
+ $idSite = Common::getRequestVar('idSite', 0, 'int');
+ $idSites = Common::getRequestVar('idSites', '', 'string');
+ $idSites = Site::getIdSitesFromIdSitesString($idSites, true);
+
+ if (!empty($idSite)) {
+ $idSites[] = $idSite;
+ }
+
+ if (empty($idSites)) {
return false;
}
- return Site::isSiteSearchEnabledFor($idSite);
+
+ foreach ($idSites as $idSite) {
+ if (!Site::isSiteSearchEnabledFor($idSite)) {
+ return false;
+ }
+ }
+
+ return true;
}
static public function checkCustomVariablesPluginEnabled()