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:
authordiosmosis <diosmosis@users.noreply.github.com>2018-09-10 04:48:38 +0300
committerGitHub <noreply@github.com>2018-09-10 04:48:38 +0300
commita977e87ecf20b075c8e9c0daf53469d8b6d075db (patch)
tree8cba4713957f8fc85c34c3644c02379c0ef916a6 /plugins/ScheduledReports
parentf8a2bdee05e97978d08a31aac7c5a58e530c45c9 (diff)
New events + some other misc changes (#13388)
* Add Access.modifyUserAccess event. * Add some template events & use request::process for LanguagesManager API. * Use the result of Sites.setSites in SitesManager API. * More comments for Site::setSitesFromArray(). * fixing plugin test.
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r--plugins/ScheduledReports/API.php10
-rw-r--r--plugins/ScheduledReports/tests/Integration/ApiTest.php1
2 files changed, 9 insertions, 2 deletions
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index 0b3bd1d5a1..922c97ad39 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -125,9 +125,15 @@ class API extends \Piwik\Plugin\API
private static function ensureLanguageSetForUser($currentUser)
{
- $lang = \Piwik\Plugins\LanguagesManager\API::getInstance()->getLanguageForUser($currentUser);
+ $lang = Request::processRequest('LanguagesManager.getLanguageForUser', [
+ 'login' => $currentUser,
+ ]);
+
if (empty($lang)) {
- \Piwik\Plugins\LanguagesManager\API::getInstance()->setLanguageForUser($currentUser, LanguagesManager::getLanguageCodeForCurrentUser());
+ Request::processRequest('LanguagesManager.setLanguageForUser', [
+ 'login' => $currentUser,
+ 'languageCode' => LanguagesManager::getLanguageCodeForCurrentUser(),
+ ]);
}
}
diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php
index 8c3e86ba30..6c3ee22169 100644
--- a/plugins/ScheduledReports/tests/Integration/ApiTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php
@@ -454,6 +454,7 @@ class ApiTest extends IntegrationTestCase
$result->addRowFromSimpleArray(array('label' => 'referrers label', 'nb_visits' => 1));
return $result;
case '\Piwik\Plugins\API\API':
+ case '\Piwik\Plugins\LanguagesManager\API':
return $realProxy->call($className, $methodName, $parametersRequest);
default:
throw new \Exception("Unexpected method $className::$methodName.");