Refs #2346 reverting my big regression in metadata output in [4525]: LOOK...

Refs #2346 reverting my big regression in metadata output in [4525]: LOOK carefully at bloody test you fool!!

git-svn-id: http://dev.piwik.org/svn/trunk@4603 59fd770c-687e-43c8-a1e3-f5a4ff64c105

plugins/API/API.php

@@ -483,7 +483,7 @@ class Piwik_API_API
         		}
         	}
         }
-        elseif(isset($reportMetadata['processedMetrics']))
+        if(isset($reportMetadata['processedMetrics']))
         {
         	// Add processed metrics
         	$dataTable->filter('AddColumnsProcessedMetrics');

tests/integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml

@@ -50,9 +50,9 @@
 			<nb_visits>1</nb_visits>
 			<nb_actions>1</nb_actions>
 			<revenue>$ 42.25</revenue>
-			<nb_actions_per_visit>0</nb_actions_per_visit>
-			<avg_time_on_site>00:00:00</avg_time_on_site>
-			<bounce_rate>0</bounce_rate>
+			<nb_actions_per_visit>1</nb_actions_per_visit>
+			<avg_time_on_site>00:18:00</avg_time_on_site>
+			<bounce_rate>100%</bounce_rate>
 
 		</row>
 

tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<website>Piwik test</website>
-	<prettyDate>14 Apr 11 - 20 Apr 11</prettyDate>
+	<prettyDate>24 Apr 11 - 30 Apr 11</prettyDate>
 	<metadata>
 		<category>Visitors</category>
 		<name>Country</name>
@@ -47,9 +47,9 @@
 			<nb_visits>3</nb_visits>
 			<nb_actions>5</nb_actions>
 			<revenue>$ 1000</revenue>
-			<nb_actions_per_visit>0</nb_actions_per_visit>
-			<avg_time_on_site>00:00:00</avg_time_on_site>
-			<bounce_rate>0</bounce_rate>
+			<nb_actions_per_visit>1.67</nb_actions_per_visit>
+			<avg_time_on_site>00:04:00</avg_time_on_site>
+			<bounce_rate>66.67%</bounce_rate>
 
 		</row>