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 <benaka@piwik.pro>2014-09-11 22:51:00 +0400
committerdiosmosis <benaka@piwik.pro>2014-09-11 22:51:00 +0400
commitf8ab11c547898f4f7acd57fc605373bd24465a8c (patch)
tree88d8b2840295eb42c10d17e360b8c1439941939d
parent83b735c87a5d3733a0ee1666f71914b66be28d2b (diff)
Fix bug in Rules::shouldSkipUniqueVisitorsCalculationForMultipleSites, should check if INI config option is not 1.
-rw-r--r--core/ArchiveProcessor/Rules.php2
-rw-r--r--tests/PHPUnit/Integration/MultipleSitesArchivingTest.php2
m---------tests/PHPUnit/UI0
3 files changed, 2 insertions, 2 deletions
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 223241e980..379817b519 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -293,7 +293,7 @@ class Rules
*/
public static function shouldSkipUniqueVisitorsCalculationForMultipleSites()
{
- return Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] == 1;
+ return Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] != 1;
}
/**
diff --git a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
index 06c366dbe5..67289069b3 100644
--- a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
+++ b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
@@ -33,7 +33,7 @@ class MultipleSitesArchivingTest extends IntegrationTestCase
}
});
- Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] = 0;
+ Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] = 1;
}
public function getApiForTesting()
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject ee77f125987288c34da30d18926a3a6ea9a48c0
+Subproject f90da55effb22bc3a549a84dbe2ea861f23dcca