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:
Diffstat (limited to 'core/Plugin/ReportsProvider.php')
-rw-r--r--core/Plugin/ReportsProvider.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/core/Plugin/ReportsProvider.php b/core/Plugin/ReportsProvider.php
index 021ca891fe..1a00c0aa7c 100644
--- a/core/Plugin/ReportsProvider.php
+++ b/core/Plugin/ReportsProvider.php
@@ -18,6 +18,7 @@ use Piwik\Cache as PiwikCache;
*/
class ReportsProvider
{
+ private $categoryList;
/**
* Get an instance of a specific report belonging to the given module and having the given action.
@@ -112,14 +113,12 @@ class ReportsProvider
public function compareCategories($catIdA, $subcatIdA, $orderA, $catIdB, $subcatIdB, $orderB)
{
- static $categoryList;
-
- if (!isset($categoryList)) {
- $categoryList = CategoryList::get();
+ if (!isset($this->categoryList)) {
+ $this->categoryList = CategoryList::get();
}
- $catA = $categoryList->getCategory($catIdA);
- $catB = $categoryList->getCategory($catIdB);
+ $catA = $this->categoryList->getCategory($catIdA);
+ $catB = $this->categoryList->getCategory($catIdB);
// in case there is a category class for both reports
if (isset($catA) && isset($catB)) {
@@ -144,9 +143,9 @@ class ReportsProvider
return $subcatA->getOrder() < $subcatB->getOrder() ? -1 : 1;
} elseif ($subcatA) {
- return -1;
- } elseif ($subcatB) {
return 1;
+ } elseif ($subcatB) {
+ return -1;
}
if ($orderA == $orderB) {