diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ScheduledReports/API.php | 10 | ||||
| -rw-r--r-- | plugins/ScheduledReports/tests/Integration/ApiTest.php | 1 | ||||
| -rw-r--r-- | plugins/SitesManager/API.php | 9 | ||||
| -rw-r--r-- | plugins/SitesManager/templates/siteWithoutData.twig | 3 | ||||
| -rw-r--r-- | plugins/UsersManager/Controller.php | 11 |
5 files changed, 26 insertions, 8 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."); diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 85cd388717..7abf627c75 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -191,7 +191,7 @@ class API extends \Piwik\Plugin\API $this->enrichSite($site); } - Site::setSitesFromArray($sites); + $sites = Site::setSitesFromArray($sites); return $sites; } @@ -272,7 +272,7 @@ class API extends \Piwik\Plugin\API $return[$site['idsite']] = $site; } - Site::setSitesFromArray($return); + $return = Site::setSitesFromArray($return); return $return; } @@ -343,7 +343,7 @@ class API extends \Piwik\Plugin\API $this->enrichSite($site); } - Site::setSitesFromArray($sites); + $sites = Site::setSitesFromArray($sites); } if ($fetchAliasUrls) { @@ -472,7 +472,7 @@ class API extends \Piwik\Plugin\API $this->enrichSite($site); } - Site::setSitesFromArray($sites); + $sites = Site::setSitesFromArray($sites); return $sites; } @@ -1622,6 +1622,7 @@ class API extends \Piwik\Plugin\API $sites = $this->getModel()->getPatternMatchSites($ids, $pattern, $limit); + $sites = Site::setSitesFromArray($sites); return $sites; } diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig index 3bee12e49d..c21c1e41e8 100644 --- a/plugins/SitesManager/templates/siteWithoutData.twig +++ b/plugins/SitesManager/templates/siteWithoutData.twig @@ -52,8 +52,11 @@ class="btn ignoreSitesWithoutData">{{ 'SitesManager_SiteWithoutDataIgnoreMessage'|translate }}</a> </p> + {{ postEvent('Template.siteWithoutData.afterIntro') }} + {{ trackingHelp|raw }} + {{ postEvent('Template.siteWithoutData.afterTrackingHelp') }} </div> {% endblock %} diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 552e81be0f..caf3e92d2b 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -376,8 +376,15 @@ class Controller extends ControllerAdmin $this->processPasswordChange($userLogin); LanguagesManager::setLanguageForSession($language); - APILanguagesManager::getInstance()->setLanguageForUser($userLogin, $language); - APILanguagesManager::getInstance()->set12HourClockForUser($userLogin, $timeFormat); + + Request::processRequest('LanguagesManager.setLanguageForUser', [ + 'login' => $userLogin, + 'languageCode' => $language, + ]); + Request::processRequest('LanguagesManager.set12HourClockForUser', [ + 'login' => $userLogin, + 'use12HourClock' => $timeFormat, + ]); APIUsersManager::getInstance()->setUserPreference($userLogin, APIUsersManager::PREFERENCE_DEFAULT_REPORT, |