diff --git a/lang/en.php b/lang/en.php
index 8107b47d47a6cb4c65eecb51e285fa21805079c6..7aea8a1ca0f5593971148340c56cf375b88cc375 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -1420,7 +1420,7 @@ Note: this token will expire in 24 hrs.",
'VisitsSummary_VisitsSummaryDocumentation' => 'This is an overview of the visit evolution.',
'VisitsSummary_NbVisits' => '%s visits',
'VisitsSummary_NbUniqueVisitors' => '%s unique visitors',
- 'VisitsSummary_NbActions' => '%s actions',
+ 'VisitsSummary_NbActionsDescription' => '%s actions',
'VisitsSummary_NbPageviewsDescription' => '%s pageviews ',
'VisitsSummary_NbUniquePageviewsDescription' => '%s unique pageviews ',
'VisitsSummary_NbDownloadsDescription' => '%s downloads ',
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 37d9789710a5529c1a2747476c74edf6ddb75bab..2e6a7eee0cc8cdc4c2d136f3ac50c3d54e4f4e39 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -48,7 +48,15 @@ class Piwik_Actions_API
return $this->getPageTitles( $idSite, $period, $date, $segment, $expanded, $idSubtable );
}
- public function getActionCounts( $idSite, $period, $date, $segment = false)
+ /**
+ * Returns the list of metrics (pages, downloads, outlinks)
+ *
+ * @param int $idSite
+ * @param string $period
+ * @param string $date
+ * @param string $segment
+ */
+ public function get( $idSite, $period, $date, $segment = false)
{
Piwik::checkUserHasViewAccess( $idSite );
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index cdd688d275d766f18a2f8a8e4ed4c90d488c8b19..254a3def5f6d0f6553753a2146f34a59c3e597de 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -95,7 +95,7 @@ class Piwik_VisitsSummary_API
}
// include action counts from actions plugin
- $actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'getActionCounts', compact('idSite', 'period', 'date', 'segment'));
+ $actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'get', compact('idSite', 'period', 'date', 'segment'));
$this->mergeDataTables($dataTable, $actionCounts);
// If only a computed metrics was requested, we delete other metrics
diff --git a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 977e448ecca307a3f2e25e03dfd6344050a71512..2e4d3f75d7f6814246243e19a72e0aa66158f619 100644
Binary files a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv and b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv differ
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index c910d2c3150665702972d0627a193234431c95de..f220f4ef874d1131cee761ff3fdb84af63b3f4ea 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -10,18 +10,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>2</nb_conversions>
-
+ <nb_visits_converted>2</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>3</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>LoggedOut</label>
@@ -33,18 +33,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>2</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>LoggedIn</label>
@@ -56,13 +56,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -76,31 +76,31 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_actions>1</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -114,13 +114,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>Value not defined</label>
@@ -132,13 +132,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -152,13 +152,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -170,13 +170,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -188,13 +188,13 @@
<label>looking at profile page</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Loggedin</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -206,7 +206,7 @@
<label>Value not defined</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -218,7 +218,7 @@
<label>FR</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
index dc7a402dbcef16af4de82105045d776467ea3013..78b8f4353ab08100dd0fdc358b5d8ad9e0150996 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
@@ -2,7 +2,7 @@
<result>
<nb_visits>3</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
+
<bounce_count>2</bounce_count>
<sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
diff --git a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 977e448ecca307a3f2e25e03dfd6344050a71512..2e4d3f75d7f6814246243e19a72e0aa66158f619 100644
Binary files a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv and b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv differ