From 1cd66a2c5065460f1c6d2d77e4778f97efb171fd Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Sun, 17 Feb 2013 23:23:22 +1300
Subject: [PATCH] Refs #2830 More fixes forgot in previous commit
---
core/Tracker/Cache.php | 4 +++-
tests/LocalTracker.php | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index 01519a07e0..49526a6bb8 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -18,9 +18,11 @@
class Piwik_Tracker_Cache
{
/**
+ * Public for tests only
* @var Piwik_CacheFile
*/
- static $trackerCache = null;
+ static public $trackerCache = null;
+
static protected function getInstance()
{
if(is_null(self::$trackerCache)) {
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index f9f7fc6a27..b4d56cfff5 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -46,7 +46,7 @@ class Piwik_LocalTracker extends PiwikTracker
}
// unset cached values
- Piwik_Common::$trackerCache = null;
+ Piwik_Tracker_Cache::$trackerCache = null;
Piwik_Tracker::setForceIp(null);
Piwik_Tracker::setForceDateTime(null);
Piwik_Tracker::setForceVisitorId(null);
@@ -60,7 +60,7 @@ class Piwik_LocalTracker extends PiwikTracker
// modify config
$GLOBALS['PIWIK_TRACKER_MODE'] = true;
$GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING'] = true;
- Piwik_Common::$initTrackerMode = false;
+ Piwik_Tracker::$initTrackerMode = false;
Piwik_Tracker::setTestEnvironment($testEnvironmentArgs, $method);
// set language
--
GitLab