Merge branch 'master' into deprecate_usersettings

Conflicts:
	core/Version.php
	plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
	tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
	tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
	tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
	tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml
	tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml
	tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
	tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml
	tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
	tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
	tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
	tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml

1 files changed, 282 insertions, 0 deletions

diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
new file mode 100644
index 0000000000..e38d88d7f5
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>1</idVisit>
+		<visitIp>74.125.31.147</visitIp>
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/</url>
+				<pageTitle />
+				<pageIdAction>1</pageIdAction>
+				<serverTimePretty>Sun 7 Apr 10:00:00</serverTimePretty>
+				<pageId>1</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon />
+			</row>
+		</actionDetails>
+		<goalConversions>0</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		<serverDate>2013-04-07</serverDate>
+		<visitServerHour>10</visitServerHour>
+		<lastActionTimestamp>1365328800</lastActionTimestamp>
+		<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
+		<searches>0</searches>
+		<actions>1</actions>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
+		<visitCount>1</visitCount>
+		<firstActionTimestamp>1365328800</firstActionTimestamp>
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<customVariables>
+		</customVariables>
+		<deviceType>Desktop</deviceType>
+		<browserFamily>Trident</browserFamily>
+		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<events>0</events>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
+		<screenType>unknown</screenType>
+		<resolution>unknown</resolution>
+		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
+		<plugins />
+		<pluginsIcons />
+		<visitLocalTime>10:00:00</visitLocalTime>
+		<visitLocalHour>10</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<serverTimestamp>1365328800</serverTimestamp>
+		<serverTimePretty>10:00:00</serverTimePretty>
+		<serverDatePretty>Sun 7 Apr</serverDatePretty>
+		<serverDatePrettyFirstAction>Sun 7 Apr</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction>
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>2</idVisit>
+		<visitIp>74.125.31.147</visitIp>
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/</url>
+				<pageTitle />
+				<pageIdAction>1</pageIdAction>
+				<serverTimePretty>Sat 6 Apr 11:00:00</serverTimePretty>
+				<pageId>2</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon />
+			</row>
+		</actionDetails>
+		<goalConversions>0</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		<serverDate>2013-04-06</serverDate>
+		<visitServerHour>11</visitServerHour>
+		<lastActionTimestamp>1365246000</lastActionTimestamp>
+		<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
+		<searches>0</searches>
+		<actions>1</actions>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
+		<visitCount>1</visitCount>
+		<firstActionTimestamp>1365246000</firstActionTimestamp>
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<customVariables>
+		</customVariables>
+		<deviceType>Desktop</deviceType>
+		<browserFamily>Trident</browserFamily>
+		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<events>0</events>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
+		<screenType>unknown</screenType>
+		<resolution>unknown</resolution>
+		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
+		<plugins />
+		<pluginsIcons />
+		<visitLocalTime>11:00:00</visitLocalTime>
+		<visitLocalHour>11</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<serverTimestamp>1365246000</serverTimestamp>
+		<serverTimePretty>11:00:00</serverTimePretty>
+		<serverDatePretty>Sat 6 Apr</serverDatePretty>
+		<serverDatePrettyFirstAction>Sat 6 Apr</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction>
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>3</idVisit>
+		<visitIp>74.125.31.147</visitIp>
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/</url>
+				<pageTitle />
+				<pageIdAction>1</pageIdAction>
+				<serverTimePretty>Fri 5 Apr 12:00:00</serverTimePretty>
+				<pageId>3</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon />
+			</row>
+		</actionDetails>
+		<goalConversions>0</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		<serverDate>2013-04-05</serverDate>
+		<visitServerHour>12</visitServerHour>
+		<lastActionTimestamp>1365163200</lastActionTimestamp>
+		<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
+		<searches>0</searches>
+		<actions>1</actions>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
+		<visitCount>1</visitCount>
+		<firstActionTimestamp>1365163200</firstActionTimestamp>
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<customVariables>
+		</customVariables>
+		<deviceType>Desktop</deviceType>
+		<browserFamily>Trident</browserFamily>
+		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<events>0</events>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
+		<screenType>unknown</screenType>
+		<resolution>unknown</resolution>
+		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
+		<plugins />
+		<pluginsIcons />
+		<visitLocalTime>12:00:00</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<serverTimestamp>1365163200</serverTimestamp>
+		<serverTimePretty>12:00:00</serverTimePretty>
+		<serverDatePretty>Fri 5 Apr</serverDatePretty>
+		<serverDatePrettyFirstAction>Fri 5 Apr</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction>
+	</row>
+</result>
\ No newline at end of file