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:
-rwxr-xr-xplugins/MultiSites/API.php2
-rw-r--r--plugins/SitesManager/API.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 3095dce6aa..fa0cf38aca 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -170,6 +170,8 @@ class API extends \Piwik\Plugin\API
}
// Both calls above have called Site::setSitesFromArray. We now get these sites:
$sitesToProblablyAdd = Site::getSites();
+ } else if (is_array($idSitesOrIdSite)) {
+ $sitesToProblablyAdd = APISitesManager::getInstance()->getSitesFromIds($idSitesOrIdSite);
} else {
$sitesToProblablyAdd = array(APISitesManager::getInstance()->getSiteFromId($idSitesOrIdSite));
}
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 2801ba86b5..c80413b7bb 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -419,7 +419,7 @@ class API extends \Piwik\Plugin\API
* @param bool $limit
* @return array
*/
- private function getSitesFromIds($idSites, $limit = false)
+ public function getSitesFromIds($idSites, $limit = false)
{
if (count($idSites) === 0) {
return array();
@@ -427,8 +427,12 @@ class API extends \Piwik\Plugin\API
if ($limit) {
$limit = "LIMIT " . (int)$limit;
+ } else {
+ $limit = '';
}
+ $idSites = array_map('intval', $idSites);
+
$db = Db::get();
$sites = $db->fetchAll("SELECT *
FROM " . Common::prefixTable("site") . "