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 <tsteur@users.noreply.github.com>2015-11-09 23:03:49 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2015-11-09 23:03:49 +0300
commit151e9385a458184f0d89fc12c79a617ca1338f41 (patch)
treed1b416392458a865271a973b88cd042759676749
parent857a772c9267dda7bae2fe814d5b87d645d44d7c (diff)
parente0c48a2d98d8dc63cf71dd321b4a2b2d206110e8 (diff)
Merge pull request #9185 from piwik/usersmanagerhook
Request API the proper way so plugins can listen to this event and change the list of users
-rw-r--r--plugins/CorePluginsAdmin/Controller.php2
-rw-r--r--plugins/UsersManager/Controller.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index ea9a386ced..c9b4a48a7c 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -247,7 +247,7 @@ class Controller extends Plugin\ControllerAdmin
$view->deactivateNonce = Nonce::getNonce(static::DEACTIVATE_NONCE);
$view->pluginsInfo = $this->getPluginsInfo($themesOnly);
- $users = \Piwik\Plugins\UsersManager\API::getInstance()->getUsers();
+ $users = Request::processRequest('UsersManager.getUsers');
$view->otherUsersCount = count($users) - 1;
$view->themeEnabled = \Piwik\Plugin\Manager::getInstance()->getThemeEnabled()->getPluginName();
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index fee919680d..3ee9849571 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -106,7 +106,7 @@ class Controller extends ControllerAdmin
if (Piwik::isUserHasSomeAdminAccess()) {
$view->showLastSeen = true;
- $users = APIUsersManager::getInstance()->getUsers();
+ $users = Request::processRequest('UsersManager.getUsers');
foreach ($users as $index => $user) {
$usersAliasByLogin[$user['login']] = $user['alias'];