Fix Tracker variable was not set properly

2 files changed, 3 insertions, 12 deletions

diff --git a/core/Config.php b/core/Config.php
index c40484cb91..d88709379a 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -225,10 +225,9 @@ class Config
             foreach ($values as &$value) {
                 $value = $this->decodeValues($value);
             }
-        } else {
-            $values = html_entity_decode($values, ENT_COMPAT, 'UTF-8');
+            return $values;
         }
-        return $values;
+        return html_entity_decode($values, ENT_COMPAT, 'UTF-8');
     }
 
     /**
diff --git a/core/Tracker.php b/core/Tracker.php
index 8b28a73596..a148eb34ea 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -11,12 +11,6 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\Config;
-use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Access;
-use Piwik\Translate;
-use Piwik\TaskScheduler;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Db\Mysqli;
@@ -24,7 +18,6 @@ use Piwik\Tracker\Db\Pdo\Mysql;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visit;
 use Piwik\Tracker\VisitInterface;
-use Piwik\PluginsManager;
 use Zend_Registry;
 
 /**
@@ -224,13 +217,12 @@ class Tracker
      */
     public function main($args = null)
     {
-        $displayedGIF = false;
         $tokenAuth = $this->initRequests($args);
 
-        $isAuthenticated = false;
         if (!empty($this->requests)) {
             foreach ($this->requests as $params) {
                 $request = new Request($params, $tokenAuth);
+                $isAuthenticated = $request->isAuthenticated();
                 $this->init($request);
 
                 try {