diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 9cf941a1353bf809ea4bd35ae0106a067f6f8e1f..b1e97f7f8b17db886defd5c9daeb227e6fb5b4d7 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -554,13 +554,14 @@ class Manager throw new \Exception('Theme not found : ' . $themeName); } - public function getNumberOfActivatedPlugins() + public function getNumberOfActivatedPluginsExcludingAlwaysActivated() { $counter = 0; $pluginNames = $this->getLoadedPluginsName(); foreach ($pluginNames as $pluginName) { - if ($this->isPluginActivated($pluginName)) { + if ($this->isPluginActivated($pluginName) + && !$this->isPluginAlwaysActivated($pluginName)) { $counter++; } } diff --git a/plugins/CoreHome/Widgets/GetSystemSummary.php b/plugins/CoreHome/Widgets/GetSystemSummary.php index fcd7d76316041ebfb08c69492d44a782119ba0f4..f68ce36d4f85c31fe69c54e91c7e4b0b71d8ecec 100644 --- a/plugins/CoreHome/Widgets/GetSystemSummary.php +++ b/plugins/CoreHome/Widgets/GetSystemSummary.php @@ -58,7 +58,7 @@ class GetSystemSummary extends Widget 'numWebsites' => count($websites), 'numUsers' => $numUsers, 'numSegments' => $this->getNumSegments(), - 'numPlugins' => $this->getNumPlugins(), + 'numPlugins' => $this->getNumActivatedPlugins(), 'piwikVersion' => Version::VERSION, 'mySqlVersion' => $this->getMySqlVersion(), 'phpVersion' => phpversion() @@ -77,8 +77,8 @@ class GetSystemSummary extends Widget return $db->getServerVersion(); } - private function getNumPlugins() + private function getNumActivatedPlugins() { - return count($this->pluginManager->getActivatedPlugins()); + return $this->pluginManager->getNumberOfActivatedPluginsExcludingAlwaysActivated(); } } \ No newline at end of file diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index db62d73aaca0bd4f12b9c556695f8884d84b563f..b90c7f5d5eba2a74a5829b4897fe930b95bbf345 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png differ