Next try

1 files changed, 84 insertions, 84 deletions

diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 5485336820..b3648771e2 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>33</idVisit>
+		<idVisit>35</idVisit>
 		<visitIp>194.57.91.215</visitIp>
 		
 		<visitorType>new</visitorType>
@@ -18,7 +18,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>33</goalPageId>
+				<goalPageId>35</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -28,7 +28,7 @@
 				<url>http://piwik.net/grue/lair</url>
 				<pageTitle>It&amp;#039;s pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
-				<pageId>33</pageId>
+				<pageId>35</pageId>
 				
 				<icon />
 			</row>
@@ -98,8 +98,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>16</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>18</idVisit>
+		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -114,7 +114,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>16</goalPageId>
+				<goalPageId>18</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -124,7 +124,7 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
-				<pageId>16</pageId>
+				<pageId>18</pageId>
 				
 				<icon />
 			</row>
@@ -145,14 +145,14 @@
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<region />
+		<city />
+		<location>Unknown</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -194,8 +194,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>15</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>17</idVisit>
+		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -210,7 +210,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>15</goalPageId>
+				<goalPageId>17</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -220,7 +220,7 @@
 				<url>http://piwik.net/grue/lair</url>
 				<pageTitle>It&amp;#039;s pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
-				<pageId>15</pageId>
+				<pageId>17</pageId>
 				
 				<icon />
 			</row>
@@ -241,14 +241,14 @@
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<region />
+		<city />
+		<location>Unknown</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -290,8 +290,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>14</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>16</idVisit>
+		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -306,7 +306,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>14</goalPageId>
+				<goalPageId>16</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -316,7 +316,7 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
-				<pageId>14</pageId>
+				<pageId>16</pageId>
 				
 				<icon />
 			</row>
@@ -339,12 +339,12 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -386,8 +386,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>13</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>15</idVisit>
+		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -402,7 +402,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>13</goalPageId>
+				<goalPageId>15</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -412,7 +412,7 @@
 				<url>http://piwik.net/grue/lair</url>
 				<pageTitle>It&amp;#039;s pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
-				<pageId>13</pageId>
+				<pageId>15</pageId>
 				
 				<icon />
 			</row>
@@ -435,12 +435,12 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -482,8 +482,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>12</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>14</idVisit>
+		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -498,7 +498,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>12</goalPageId>
+				<goalPageId>14</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -508,7 +508,7 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
-				<pageId>12</pageId>
+				<pageId>14</pageId>
 				
 				<icon />
 			</row>
@@ -535,8 +535,8 @@
 		<countryCode>ru</countryCode>
 		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -578,8 +578,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>11</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>13</idVisit>
+		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -594,7 +594,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>11</goalPageId>
+				<goalPageId>13</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -604,7 +604,7 @@
 				<url>http://piwik.net/grue/lair</url>
 				<pageTitle>It&amp;#039;s pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
-				<pageId>11</pageId>
+				<pageId>13</pageId>
 				
 				<icon />
 			</row>
@@ -631,8 +631,8 @@
 		<countryCode>ru</countryCode>
 		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -674,8 +674,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>10</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>12</idVisit>
+		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -690,7 +690,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>10</goalPageId>
+				<goalPageId>12</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -700,7 +700,7 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
-				<pageId>10</pageId>
+				<pageId>12</pageId>
 				
 				<icon />
 			</row>
@@ -723,12 +723,12 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
-		<region>Kent</region>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -770,8 +770,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>9</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>11</idVisit>
+		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -786,7 +786,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>9</goalPageId>
+				<goalPageId>11</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -796,7 +796,7 @@
 				<url>http://piwik.net/grue/lair</url>
 				<pageTitle>It&amp;#039;s pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
-				<pageId>9</pageId>
+				<pageId>11</pageId>
 				
 				<icon />
 			</row>
@@ -819,12 +819,12 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
-		<region>Kent</region>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -866,8 +866,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>8</idVisit>
-		<visitIp>1.2.4.3</visitIp>
+		<idVisit>10</idVisit>
+		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -882,7 +882,7 @@
 				<type>goal</type>
 				<goalName>all</goalName>
 				<revenue>5</revenue>
-				<goalPageId>8</goalPageId>
+				<goalPageId>10</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -892,7 +892,7 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
-				<pageId>8</pageId>
+				<pageId>10</pageId>
 				
 				<icon />
 			</row>
@@ -918,9 +918,9 @@
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
 		<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
-		<region>London, City of</region>
-		<city>London</city>
-		<location>London, London, City of, United Kingdom</location>
+		<region>Kent</region>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>