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:
-rw-r--r--core/Plugin/Manager.php3
-rw-r--r--plugins/MultiSites/MultiSites.php2
-rw-r--r--tests/PHPUnit/Fixtures/OmniFixture.php2
3 files changed, 4 insertions, 3 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index e209e56166..0de9ad97ca 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -69,7 +69,8 @@ class Manager extends Singleton
'ExampleVisualization',
'ExamplePluginTemplate',
'ExampleTheme',
- 'LeftMenu'
+ 'LeftMenu',
+ 'Zeitgeist',
);
public function getPluginsToLoadDuringTests()
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index a1e4e027a0..17d876a25a 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -55,7 +55,7 @@ class MultiSites extends \Piwik\Plugin
'metrics' => $metadataMetrics,
'processedMetrics' => false,
'constantRowsCount' => false,
- 'order' => 5
+ 'order' => 4
);
$reports[] = array(
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index e3c33b3db3..4c1c38236e 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -41,7 +41,7 @@ class Test_Piwik_Fixture_OmniFixture extends Test_Piwik_BaseFixture
$fixture = new $className();
if (!property_exists($fixture, 'dateTime')) {
continue;
- }
+ }
$fixture->dateTime = $this->adjustDateTime($fixture->dateTime, $date);