Fixes #1454

 * By default, show all columns merged 
 * thanks timo for last patches now looks consistent

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

plugins/API/API.php

@@ -768,7 +768,9 @@ class Piwik_API_API
 	}
 	
 	
-	/** Get a combined report of the *.get API methods. */
+	/** 
+	 * Get a combined report of the *.get API methods. 
+	 */
 	public function get( $idSite, $period, $date, $segment = false, $columns = false)
 	{
 		$columns = Piwik::getArrayFromApiParameter($columns);
@@ -791,7 +793,9 @@ class Piwik_API_API
 				foreach ($reportMeta['metrics'] as $column => $columnTranslation)
 				{
 					// a metric from this report has been requested
-					if (isset($columnsMap[$column]))
+					if (isset($columnsMap[$column])
+					// or by default, return all metrics
+						|| empty($columnsMap))
 					{
 						$columnsByPlugin[$plugin][] = $column;
 					}
@@ -800,14 +804,13 @@ class Piwik_API_API
 		}
 		
 		$mergedDataTable = false;
-		$params = compact('idSite', 'period', 'date', 'segment');
+		$params = compact('idSite', 'period', 'date', 'segment', 'idGoal');
 		foreach ($columnsByPlugin as $plugin => $columns)
 		{
 			// load the data		
 			$className = 'Piwik_'.$plugin.'_API';
 			$params['columns'] = implode(',', $columns);
 			$dataTable = Piwik_API_Proxy::getInstance()->call($className, 'get', $params);
-			
 			// make sure the table has all columns
 			$array = ($dataTable instanceof Piwik_DataTable_Array ? $dataTable->getArray() : array($dataTable));
 			foreach ($array as $table) 

tests/integration/expected/test_apiGetReportMetadata__API.get_day.xml

 <?xml version="1.0" encoding="utf-8" ?>
-<result>0</result>
\ No newline at end of file
+<result>
+	<nb_uniq_visitors>1</nb_uniq_visitors>
+	<nb_visits>1</nb_visits>
+	<nb_actions>1</nb_actions>
+	<max_actions>1</max_actions>
+	<bounce_rate>100%</bounce_rate>
+	<nb_actions_per_visit>1</nb_actions_per_visit>
+	<avg_time_on_site>1086</avg_time_on_site>
+	<nb_pageviews>1</nb_pageviews>
+	<nb_uniq_pageviews>1</nb_uniq_pageviews>
+	<nb_downloads>0</nb_downloads>
+	<nb_uniq_downloads>0</nb_uniq_downloads>
+	<nb_outlinks>0</nb_outlinks>
+	<nb_uniq_outlinks>0</nb_uniq_outlinks>
+	<nb_conversions>1</nb_conversions>
+	<nb_visits_converted>1</nb_visits_converted>
+	<conversion_rate>100</conversion_rate>
+	<revenue>42.26</revenue>
+	<nb_visits_returning>0</nb_visits_returning>
+	<bounce_count_returning>0</bounce_count_returning>
+	<bounce_rate_returning>0%</bounce_rate_returning>
+	<nb_actions_returning>0</nb_actions_returning>
+	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
+</result>
\ No newline at end of file