refs #4996 fix tracker and clear content target if not set for now

core/Tracker/TableLogAction.php

@@ -235,6 +235,7 @@ class TableLogAction
             'contentPiece' => Action::TYPE_CONTENT_PIECE,
             'contentTarget' => Action::TYPE_CONTENT_TARGET,
             'contentName' => Action::TYPE_CONTENT_NAME,
+            'contentInteraction' => Action::TYPE_CONTENT_INTERACTION,
         );
         if(!empty($exactMatch[$segmentName])) {
             return $exactMatch[$segmentName];

libs/PiwikTracker/PiwikTracker.php

@@ -899,7 +899,7 @@ class PiwikTracker
             throw new Exception("You must specify a content name");
         }
 
-        $url .= 'c_n=' . urlencode($contentName);
+        $url .= '&c_n=' . urlencode($contentName);
 
         if (!empty($contentPiece) && strlen($contentPiece) > 0) {
             $url .= '&c_p=' . urlencode($contentPiece);
@@ -934,8 +934,8 @@ class PiwikTracker
             throw new Exception("You must specify a content name");
         }
 
-        $url .= 'c_i=' . urlencode($interaction);
-        $url .= 'c_n=' . urlencode($contentName);
+        $url .= '&c_i=' . urlencode($interaction);
+        $url .= '&c_n=' . urlencode($contentName);
 
         if (!empty($contentPiece) && strlen($contentPiece) > 0) {
             $url .= '&c_p=' . urlencode($contentPiece);

plugins/Contents/API.php

@@ -13,6 +13,7 @@ use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\Plugins\Contents\Archiver;
 
 /**
  * API for plugin Contents
@@ -54,6 +55,11 @@ class API extends \Piwik\Plugin\API
             if ($row) {
                 $row->setColumn('label', Piwik::translate('General_NotDefined', Piwik::translate('Contents_ContentPiece')));
             }
+            foreach ($table->getRows() as $row) {
+                if ($row->getMetadata('contentTarget') === Archiver::CONTENT_TARGET_NOT_SET) {
+                    $row->setMetadata('contentTarget', '');
+                }
+            }
         });
 
         // Content interaction rate = interactions / impressions