Smaller varchar size for log_action.name (#14859)

15 files changed, 12 insertions, 92 deletions

diff --git a/plugins/Contents/API.php b/plugins/Contents/API.php
index 37754b881d..e2a385b35f 100644
--- a/plugins/Contents/API.php
+++ b/plugins/Contents/API.php
@@ -64,11 +64,6 @@ 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', '');
-                }
-            }
         });
     }
 }
diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php
index a627ac38d8..af594b7233 100644
--- a/plugins/Contents/Archiver.php
+++ b/plugins/Contents/Archiver.php
@@ -76,7 +76,6 @@ class Archiver extends \Piwik\Plugin\Archiver
     {
         $select = "
                 log_action_content_piece.name as contentPiece,
-                log_action_content_target.name as contentTarget,
                 log_action_content_name.name as contentName,
 
 				count(distinct log_link_visit_action.idvisit) as `" . Metrics::INDEX_NB_VISITS . "`,
@@ -111,13 +110,13 @@ class Archiver extends \Piwik\Plugin\Archiver
                     log_link_visit_action.idaction_content_target,
                     log_link_visit_action.idaction_content_name";
 
-        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC";
+        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC, `contentName`";
 
         $rankingQueryLimit = ArchivingHelper::getRankingQueryLimit();
         $rankingQuery = null;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->addLabelColumn(array('contentPiece', 'contentTarget', 'contentName'));
+            $rankingQuery->addLabelColumn(array('contentPiece', 'contentName'));
             $rankingQuery->addColumn(array(Metrics::INDEX_NB_UNIQ_VISITORS));
             $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_IMPRESSIONS, Metrics::INDEX_NB_VISITS), 'sum');
         }
@@ -258,7 +257,6 @@ class Archiver extends \Piwik\Plugin\Archiver
             }
 
             $dataArray->sumMetricsImpressions($mainLabel, $row);
-            $this->rememberMetadataForRow($row, $mainLabel);
 
             $subDimension = $dimensions[1];
             $subLabel     = $row[$subDimension];
@@ -297,18 +295,4 @@ class Archiver extends \Piwik\Plugin\Archiver
             $dataArray->sumMetricsContentsInteractionPivot($mainLabel, $subLabel, $row);
         }
     }
-
-    private function rememberMetadataForRow($row, $mainLabel)
-    {
-        $this->metadata[$mainLabel] = array();
-
-        $target = $row['contentTarget'];
-        if (empty($target)) {
-            $target = Archiver::CONTENT_TARGET_NOT_SET;
-        }
-
-        // there can be many different targets
-        $this->metadata[$mainLabel]['contentTarget'] = $target;
-    }
-
 }
diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php
index ccb7a69086..06061fe605 100644
--- a/plugins/Contents/tests/System/ContentsTest.php
+++ b/plugins/Contents/tests/System/ContentsTest.php
@@ -27,6 +27,7 @@ class ContentsTest extends SystemTestCase
      */
     public function testApi($api, $params)
     {
+        $params['xmlFieldsToRemove'] = array('idsubdatatable');
         if(self::isMysqli()) {
             $this->markTestSkipped('Sometimes fail on MYSQLI (at random)');
         }
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
index 79bb37bba2..674d7036e9 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
@@ -63,17 +63,14 @@
 	<reportMetadata>
 		<result prettyDate="Sunday, January 3, 2010">
 			<row>
-				<contentTarget>http://www.example.com</contentTarget>
 				<segment>contentName==ImageAd</segment>
-				<idsubdatatable>1</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget>http://piwik.org/</contentTarget>
 				<segment>contentName==Text+Ad</segment>
-				<idsubdatatable>2</idsubdatatable>
+				<idsubdatatable>1</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget />
 				<segment>contentName==Video+Ad</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
index 891b4c4c4e..aa5f297467 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -87,38 +87,31 @@
 	<reportMetadata>
 		<result prettyDate="Sunday, January 3, 2010">
 			<row>
-				<contentTarget>http://piwik.org/download</contentTarget>
 				<segment>contentPiece==Click+to+download+Piwik+now</segment>
-				<idsubdatatable>5</idsubdatatable>
+				<idsubdatatable>1</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget>http://www.example.com</contentTarget>
 				<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
-				<idsubdatatable>3</idsubdatatable>
+				<idsubdatatable>6</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget>http://www.example.com</contentTarget>
 				<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
-				<idsubdatatable>4</idsubdatatable>
+				<idsubdatatable>7</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget>http://piwik.org/</contentTarget>
 				<segment>contentPiece==Click+NOW</segment>
-				<idsubdatatable>6</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget />
-				<idsubdatatable>1</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget />
 				<segment>contentPiece==movie.mov</segment>
-				<idsubdatatable>7</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 			<row>
-				<contentTarget />
 				<segment>contentPiece==Unknown</segment>
-				<idsubdatatable>2</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010" />
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
index aab05b8c9c..fb6ce6eb1c 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>8</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>6</nb_impressions>
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
index 4523ce37fc..a50c3d0d2c 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
@@ -7,7 +7,6 @@
 		<nb_interactions>2</nb_interactions>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<interaction_rate>25%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_interactions>4</nb_interactions>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<interaction_rate>66.67%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
index ccdd21b1d9..fca86f9cea 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
-		<contentTarget>http://piwik.org/download</contentTarget>
 		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
@@ -37,7 +34,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
@@ -47,7 +43,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -56,7 +51,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
@@ -66,7 +60,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
index 64b79d5d08..d169477e38 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
@@ -7,7 +7,6 @@
 		<nb_interactions>2</nb_interactions>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<interaction_rate>50%</interaction_rate>
-		<contentTarget>http://piwik.org/download</contentTarget>
 		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_interactions>2</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
@@ -37,7 +34,6 @@
 		<nb_interactions>2</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
@@ -47,7 +43,6 @@
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -56,7 +51,6 @@
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
@@ -66,7 +60,6 @@
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
index aab05b8c9c..fb6ce6eb1c 100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>8</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>6</nb_impressions>
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
index ccdd21b1d9..fca86f9cea 100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
-		<contentTarget>http://piwik.org/download</contentTarget>
 		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
@@ -37,7 +34,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
@@ -47,7 +43,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -56,7 +51,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
@@ -66,7 +60,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
index aab05b8c9c..fb6ce6eb1c 100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>8</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>6</nb_impressions>
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
index ccdd21b1d9..fca86f9cea 100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
-		<contentTarget>http://piwik.org/download</contentTarget>
 		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
@@ -37,7 +34,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
@@ -47,7 +43,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -56,7 +51,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
@@ -66,7 +60,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
index aab05b8c9c..fb6ce6eb1c 100755
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>8</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>6</nb_impressions>
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
index ccdd21b1d9..fca86f9cea 100755
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
@@ -7,7 +7,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
-		<contentTarget>http://piwik.org/download</contentTarget>
 		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
@@ -17,7 +16,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
@@ -27,7 +25,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget>http://www.example.com</contentTarget>
 		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
@@ -37,7 +34,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
-		<contentTarget>http://piwik.org/</contentTarget>
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
@@ -47,7 +43,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -56,7 +51,6 @@
 		<nb_impressions>4</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
@@ -66,7 +60,6 @@
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
-		<contentTarget />
 		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file