Clean up

Author: iMattPro

language/en/googleanalytics_acp.php

@@ -38,8 +38,8 @@
 //
 
 $lang = array_merge($lang, array(
-	'ACP_GOOGLEANALYTICS'						=> 'Google Analytics',
-	'ACP_GOOGLEANALYTICS_ID'					=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'			=> 'Enter your Google Analytics ID code, e.g.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics can track your registered users across multiple devices and sessions, for a more accurate user count in your reports. To enable this enhanced functionality it must be configured in your Google Analytics account. <a href="https://support.google.com/analytics/answer/3123666">Click for more information</a>.',
-	'ACP_GOOGLEANALYTICS_ID_INVALID'			=> '“%s” is not a valid Google Analytics ID code.<br />It should be in the form “UA-0000000-00”.',
+	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
+	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics ID',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Enter your Google Analytics ID code, e.g.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics can track your registered users across multiple devices and sessions, for a more accurate user count in your reports. To enable this enhanced functionality User ID tracking must be configured in your Google Analytics account. <a href="https://support.google.com/analytics/answer/3123666">Click for more information</a>.',
+	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” is not a valid Google Analytics ID code.<br />It should be in the form “UA-0000000-00”.',
 ));

tests/event/listener_test.php

@@ -40,14 +40,9 @@ public function setUp()
 		$phpbb_extension_manager = new \phpbb_mock_extension_manager($phpbb_root_path);
 
 		// Load/Mock classes required by the event listener class
-		$this->config = new \phpbb\config\config(array(
-			'googleanalytics_id' => 'UA-000000-01',
-			'googleanalytics_track_user_id' => 1,
-		));
-
+		$this->config = new \phpbb\config\config(array('googleanalytics_id' => 'UA-000000-01'));
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
-
 		$this->user = new \phpbb\user('\phpbb\datetime');
 		$this->user->data['user_id'] = 2;
 		$this->user->data['is_registered'] = true;
@@ -117,7 +112,7 @@ public function add_googleanalytics_configs_data()
 			array( // expected config and mode
 				'settings',
 				array('vars' => array('warnings_expire_days' => array())),
-				array('warnings_expire_days', 'legend_googleanalytics', 'googleanalytics_id', 'googleanalytics_track_user_id'),
+				array('warnings_expire_days', 'legend_googleanalytics', 'googleanalytics_id'),
 			),
 			array( // unexpected mode
 				'foobar',