Fixing post merge bugs

10 files changed, 18 insertions, 16 deletions

diff --git a/core/Controller.php b/core/Controller.php
index 310c7602b8..34233cdf56 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -30,9 +30,8 @@ use Piwik\Url;
 use Piwik_UsersManager_API;
 use Piwik\View;
 use Piwik\ViewDataTable;
-use Piwik\ViewDataTable\GenerateGraphHtml\ChartEvolution;
+use Piwik\ViewDataTable\GenerateGraphHTML\ChartEvolution;
 use Zend_Registry;
-use false;
 
 /**
  * Parent class of all plugins Controllers (located in /plugins/PluginName/Controller.php
diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
index 60eb77bce7..85057c719c 100644
--- a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
+++ b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
@@ -9,7 +9,7 @@
  * @package Piwik
  */
 
-namespace Piwik\ViewDataTable\GenerateGraphHtml;
+namespace Piwik\ViewDataTable\GenerateGraphHTML;
 
 use Piwik\Common;
 use Piwik\Period\Range;
diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartPie.php b/core/ViewDataTable/GenerateGraphHTML/ChartPie.php
index 5f6e33b785..de5e541b33 100644
--- a/core/ViewDataTable/GenerateGraphHTML/ChartPie.php
+++ b/core/ViewDataTable/GenerateGraphHTML/ChartPie.php
@@ -8,7 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
-namespace Piwik\ViewDataTable\GenerateGraphHtml;
+namespace Piwik\ViewDataTable\GenerateGraphHTML;
 
 use Piwik\ViewDataTable\GenerateGraphHTML;
 
diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php b/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php
index 05d046494a..78d9f3c3a3 100644
--- a/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php
+++ b/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php
@@ -8,8 +8,7 @@
  * @category Piwik
  * @package Piwik
  */
-namespace Piwik\ViewDataTable\GenerateGraphHtml;
-
+namespace Piwik\ViewDataTable\GenerateGraphHTML;
 use Piwik\ViewDataTable\GenerateGraphHTML;
 
 /**
diff --git a/core/ViewDataTable/Sparkline.php b/core/ViewDataTable/Sparkline.php
index 0560dbab71..710d5ae6c1 100644
--- a/core/ViewDataTable/Sparkline.php
+++ b/core/ViewDataTable/Sparkline.php
@@ -14,7 +14,6 @@ use Exception;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\ViewDataTable;
-use Piwik\Visualization\Sparkline;
 
 /**
  * Reads the requested DataTable from the API and prepare data for the Sparkline view.
@@ -54,7 +53,7 @@ class Sparkline extends ViewDataTable
             $values = array_fill(0, 30, 0);
         }
 
-        $graph = new Sparkline();
+        $graph = new \Piwik\Visualization\Sparkline();
         $graph->setValues($values);
 
         $height = Common::getRequestVar('height', 0, 'int');
diff --git a/core/functions.php b/core/functions.php
index f57a717ed8..ba9caceee8 100644
--- a/core/functions.php
+++ b/core/functions.php
@@ -256,9 +256,10 @@ namespace {
         Top::getInstance()->rename($topMenuOriginal, null, $topMenuRenamed, null);
     }
 
-    if(class_exists('DataTableSummaryRow')) {
-
-        // Bridge between pre Piwik2 serialized format and namespaced classes
+    // Bridge between pre Piwik2 serialized format and namespaced classes
+    // Do not define these classes in tracker or archive
+    if(empty($GLOBALS['PIWIK_TRACKER_MODE'])
+        && !defined('PIWIK_MODE_ARCHIVE')) {
         class Piwik_DataTable_Row_DataTableSummary extends \Piwik\DataTable\Row\DataTableSummaryRow {
         }
 
diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 391cbc5f6f..1f63c26ebf 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -63,7 +63,9 @@ define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 define('PIWIK_ENABLE_DISPATCH', false);
 define('PIWIK_ENABLE_ERROR_HANDLER', false);
 define('PIWIK_ENABLE_SESSION_START', false);
-define('PIWIK_MODE_ARCHIVE', true);
+if(!defined('PIWIK_MODE_ARCHIVE')) {
+    define('PIWIK_MODE_ARCHIVE', true);
+}
 
 require_once PIWIK_INCLUDE_PATH . "/index.php";
 require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php";
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index d7469643ff..63e76f04a9 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -15,7 +15,7 @@ use Piwik\Metrics;
 use Piwik\Date;
 use Piwik\ViewDataTable;
 use Piwik\Url;
-use Piwik\ViewDataTable\GenerateGraphHtml\ChartEvolution;
+use Piwik\ViewDataTable\GenerateGraphHTML\ChartEvolution;
 use Piwik\Visualization\Chart\Evolution;
 
 /**
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index b4d3107f86..6e015ab681 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -1,5 +1,9 @@
 <?php
 
+if (!defined('PIWIK_TEST_MODE')) {
+    define('PIWIK_TEST_MODE', true);
+}
+
 /**
  * Sets the test environment.
  */
@@ -7,9 +11,6 @@ class Piwik_TestingEnvironment
 {
     public static function addHooks()
     {
-        if (!defined('PIWIK_TEST_MODE')) {
-            define('PIWIK_TEST_MODE', true);
-        }
         Piwik_AddAction('Access.createAccessSingleton', function($access) {
             $access->setSuperUser(true);
         });
diff --git a/tests/PHPUnit/proxy/archive.php b/tests/PHPUnit/proxy/archive.php
index 7960079c65..00a4269a04 100644
--- a/tests/PHPUnit/proxy/archive.php
+++ b/tests/PHPUnit/proxy/archive.php
@@ -1,4 +1,5 @@
 <?php
+define('PIWIK_MODE_ARCHIVE', true);
 
 // make sure the test environment is loaded
 require_once realpath(dirname(__FILE__)) . '/../../../core/EventDispatcher.php';