From b1290f9264fdb0ad649006c3f6b2698952c33c17 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Wed, 7 Jan 2015 05:43:47 +0000
Subject: [PATCH] fix more ui tests, Cache cannot be used as Piwik\Cache is
already defined
---
core/Common.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/Common.php b/core/Common.php
index 5e09c62934..ac913d97ea 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -11,7 +11,7 @@ namespace Piwik;
use Exception;
use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
use Piwik\Tracker;
-use Piwik\Tracker\Cache;
+use Piwik\Tracker\Cache as TrackerCache;
/**
* Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
@@ -1211,7 +1211,7 @@ class Common
*/
public static function getCurrentLocationProviderId()
{
- $cache = Cache::getCacheGeneral();
+ $cache = TrackerCache::getCacheGeneral();
return empty($cache['currentLocationProviderId'])
? DefaultProvider::ID
: $cache['currentLocationProviderId'];
--
GitLab