From bbdd5be6cb3b621002be3ca9ec41eae72bf69654 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Tue, 12 Aug 2014 14:34:29 +0200
Subject: [PATCH] refs #5987 fix test which proofs issue is fixed now and added
 change to changlog

---
 CHANGELOG.md                                  |  1 +
 ...e_IndexedByDate__MultiSites.getAll_day.xml | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b199db49684..a6f0829799c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
   `$setting->transform = function ($value) { return Common::sanitizeInputValue($value); }`
 * Config setting `disable_merged_assets` moved from `Debug` section to `Development`. The updater will automatically change the section for you.
 * `API.getRowEvolution` will throw an exception if a report is requested that does not have a dimension, for instance `VisitsSummary.get`. This is a fix as an invalid format was returned before see [#5951](https://github.com/piwik/piwik/issues/5951)
+* `MultiSites.getAll` returns from now on always an array of websites. In the past it returned a single object and it didn't contain all properties in case only one website was found which was a bug see [#5987](https://github.com/piwik/piwik/issues/5987)
 
 ### Deprecations
 The following events are considered as deprecated and the new structure should be used in the future. We have not scheduled when those events will be removed but probably in Piwik 3.0 which is not scheduled yet and won't be soon. New features will be added only to the new classes.
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
index 34216a51a14..75e0ce77284 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits>2</nb_visits>
-	<nb_actions>3</nb_actions>
-	<label>Site AAAAAA</label>
-	<visits_evolution>0%</visits_evolution>
-	<actions_evolution>0%</actions_evolution>
-	<pageviews_evolution>0%</pageviews_evolution>
-	<revenue_evolution>0%</revenue_evolution>
-	<nb_pageviews>3</nb_pageviews>
-	<revenue>0</revenue>
+	<row>
+		<nb_visits>2</nb_visits>
+		<nb_actions>3</nb_actions>
+		<label>Site AAAAAA</label>
+		<visits_evolution>0%</visits_evolution>
+		<actions_evolution>0%</actions_evolution>
+		<pageviews_evolution>0%</pageviews_evolution>
+		<revenue_evolution>0%</revenue_evolution>
+		<nb_pageviews>3</nb_pageviews>
+		<revenue>0</revenue>
+		<group />
+		<main_url>http://piwik.net</main_url>
+		<idsite>1</idsite>
+	</row>
 </result>
\ No newline at end of file