diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 6545e1087b416161d82d26ba0fd2eec1972a8513..9b9f4b2d72b6f1ea70a4d6d8f657311152b08021 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -63,6 +63,10 @@ class Piwik_VisitsSummary_API 'sum_visit_length', 'max_actions', ); + if(!Piwik::isUniqueVisitorsEnabled($period)) + { + unset($columns[array_search('nb_uniq_visitors', $columns)]); + } } $dataTable = $archive->getDataTableFromNumeric($columns); diff --git a/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml b/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml index f5dba9713126fd8bb5551678066f3c9bc85c3357..2c7964c16da5af4b283afd526286bf903eda5aa1 100644 --- a/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml +++ b/tests/integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>6</nb_visits> - <nb_uniq_visitors>3</nb_uniq_visitors> <nb_actions>9</nb_actions> <nb_visits_converted>0</nb_visits_converted> <bounce_count>3</bounce_count> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index 650af9dcdc07fd1d293b0e5ebd9410a812e6a3da..dd731e2dd002dd591c91215efcdc8633773a055f 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>20 Mar 11 - 26 Mar 11</prettyDate> + <prettyDate>23 Mar 11 - 29 Mar 11</prettyDate> <metadata> <category>Visitors</category> <name>Country</name> @@ -10,7 +10,6 @@ <dimension>Country</dimension> <metrics> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> </metrics> @@ -37,7 +36,6 @@ <columns> <label>Country</label> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> @@ -56,7 +54,6 @@ <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> - <nb_uniq_visitors>0</nb_uniq_visitors> </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 a081bab45e99389342fbde8d63712fd0ea447fac..a040fbc4fc7887ea0323853a4f0edb792de28d5e 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 @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_visits>3</nb_visits> - <nb_uniq_visitors>3</nb_uniq_visitors> <nb_actions>5</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>2</bounce_count>