Removes CustomVariables plugin from core (#16090)

* Removes CustomVariables plugin

* removes CustomVariables plugin from core list

* Move methods to get custom variables from request to the plugin

* define visit fields to persist in plugin

* do not use custom variables plugin if not available

* adjust test requirements for CustomVariables plugin

* Only execute update if plugin is installed

* do not consider custom variables widget as api in tests

* move autosuggest tests for custom variables to plugin

* do not use custom variable segments in core tests

* move multi column segment test to custom variables plugin

* do not use custom variable segment in archive cron test

* update access log to use new product view parameters instead of custom variables

* move some custom variables based tests to plugin

* Use Contents API instead of CustomVariables for CSV export tests

* skip some tests if CustomVariables plugin is not available

* Adjust tracker code generator tests to work without custom variables plugin

* [TEMP] remove custom variables from system test output

* adjust some tests to run without custom variables plugin

* apply some review feedback

* Readds Custom Variables as submodule (#16104)

* Adds CustomVariables as submodule

* Revert "[TEMP] remove custom variables from system test output"

This reverts commit 30b56dc135b6c130c841306f739dbcd7d9f4a366.

* use submodule branch

* test changes due to loading CustomVariables as submodule (plugin order)

* updates some expected screenshots

* improve test fixture

* submodule update

7 files changed, 102 insertions, 102 deletions

diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php
index de9545fad1..cdb32d2d5e 100644
--- a/plugins/Live/tests/Integration/ModelTest.php
+++ b/plugins/Live/tests/Integration/ModelTest.php
@@ -284,7 +284,7 @@ class ModelTest extends IntegrationTestCase
             $idSite = 1,
             $dateStart,
             $dateEnd,
-            $segment = 'customVariablePageName1==Test',
+            $segment = 'siteSearchCategory==Test',
             $offset = 10,
             $limit = 100,
             $visitorId = 'abc',
@@ -299,7 +299,7 @@ class ModelTest extends IntegrationTestCase
                             AND log_visit.idvisitor = ? 
                             AND log_visit.visit_last_action_time >= ? 
                             AND log_visit.visit_last_action_time <= ? ) 
-                            AND ( log_link_visit_action.custom_var_k1 = ? ) 
+                            AND ( log_link_visit_action.search_cat = ? ) 
                         GROUP BY log_visit.idvisit 
                         ORDER BY log_visit.idsite DESC, log_visit.visit_last_action_time DESC
                          LIMIT 10, 100';
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 167476415c..b179e112cf 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -127,8 +127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -145,6 +143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -252,8 +252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -270,6 +268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -377,8 +377,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -395,6 +393,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -502,8 +502,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -520,6 +518,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -627,8 +627,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -645,6 +643,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -752,8 +752,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -770,6 +768,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -877,8 +877,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -895,6 +893,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1002,8 +1002,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1020,6 +1018,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1127,8 +1127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1145,6 +1143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1252,8 +1252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1270,6 +1268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 	</lastVisits>
 	
diff --git a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml
index 59d0cb2e38..dd4a83207c 100644
--- a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml
@@ -106,8 +106,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -124,6 +122,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -231,8 +231,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -249,5 +247,7 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml
index 354caa4104..75773aaa14 100644
--- a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml
@@ -106,8 +106,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -124,6 +122,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -231,8 +231,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -249,6 +247,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -356,8 +356,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -374,6 +372,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -671,8 +671,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -689,5 +687,7 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index fc8faf9add..ec12c9ae00 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -127,8 +127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -145,6 +143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -252,8 +252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -270,6 +268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -377,8 +377,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -395,6 +393,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -502,8 +502,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -520,6 +518,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -627,8 +627,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -645,6 +643,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -752,8 +752,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -770,6 +768,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -877,8 +877,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -895,6 +893,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1002,8 +1002,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1020,6 +1018,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1127,8 +1127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1145,6 +1143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1252,8 +1252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1270,6 +1268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1377,8 +1377,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1395,6 +1393,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1502,8 +1502,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1520,6 +1518,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1627,8 +1627,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1645,6 +1643,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1752,8 +1752,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1770,6 +1768,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1877,8 +1877,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1895,6 +1893,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2002,8 +2002,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -2020,6 +2018,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2127,8 +2127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -2145,6 +2143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2252,8 +2252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -2270,6 +2268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2377,8 +2377,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -2395,6 +2393,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2502,8 +2502,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -2520,6 +2518,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 	</lastVisits>
 	
diff --git a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml
index 575456cc65..1eb2a9a8d0 100644
--- a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml
@@ -127,8 +127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -145,6 +143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -252,8 +252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -270,6 +268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -377,8 +377,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -395,6 +393,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -502,8 +502,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -520,6 +518,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -627,8 +627,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -645,6 +643,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -752,8 +752,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -770,6 +768,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -877,8 +877,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -895,6 +893,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1002,8 +1002,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1020,6 +1018,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1127,8 +1127,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1145,6 +1143,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1252,8 +1252,6 @@
 			<visitLocalHour>12</visitLocalHour>
 			<daysSinceLastVisit>1</daysSinceLastVisit>
 			<secondsSinceLastVisit>86400</secondsSinceLastVisit>
-			<customVariables>
-			</customVariables>
 			<resolution>1024x768</resolution>
 			<plugins>cookie, flash, java</plugins>
 			<pluginsIcons>
@@ -1270,6 +1268,8 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
+			<customVariables>
+			</customVariables>
 		</row>
 	</lastVisits>
 	
diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml
index 354caa4104..75773aaa14 100644
--- a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml
@@ -106,8 +106,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -124,6 +122,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -231,8 +231,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -249,6 +247,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -356,8 +356,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>360</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -374,6 +372,8 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -671,8 +671,6 @@
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<customVariables>
-		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>cookie, flash, java</plugins>
 		<pluginsIcons>
@@ -689,5 +687,7 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
+		<customVariables>
+		</customVariables>
 	</row>
 </result>
\ No newline at end of file