Fix tests

Author: iMattPro

event/listener.php

@@ -146,7 +146,7 @@ public function validate_googleanalytics_id($event)
 			$error = $event['error'];
 
 			// Add error message if the input is not a valid Google Analytics ID
-			if (!preg_match('/^UA-\d{4,9}-\d{1,4}|G-[A-Z0-9]{10}$/', $input))
+			if (!preg_match('/^UA-\d{4,9}-\d{1,4}$|^G-[A-Z0-9]{10}$/', $input))
 			{
 				$error[] = $this->user->lang('ACP_GOOGLEANALYTICS_ID_INVALID', $input);
 			}

tests/event/listener_test.php

@@ -172,32 +172,47 @@ public function validate_googleanalytics_id_data()
 		return array(
 			array(
 				// valid code, no error
-				array('googleanalytics_id' => 'UA-0000-00'),
+				array('googleanalytics_id' => 'UA-0000-00', 'googleanalytics_tag' => 0),
+				array(),
+			),
+			array(
+				// valid code, no error
+				array('googleanalytics_id' => 'UA-0000-00', 'googleanalytics_tag' => 1),
+				array(),
+			),
+			array(
+				// valid code, no error
+				array('googleanalytics_id' => 'G-XXXXXXXXXX', 'googleanalytics_tag' => 1),
 				array(),
 			),
 			array(
 				// no code, no error
-				array('googleanalytics_id' => ''),
+				array('googleanalytics_id' => '', 'googleanalytics_tag' => 1),
 				array(),
 			),
+			array(
+				// invalid code, no error
+				array('googleanalytics_id' => 'G-XXXXXXXXXX', 'googleanalytics_tag' => 0),
+				array('ACP_GOOGLEANALYTICS_TAG_INVALID'),
+			),
 			array(
 				// invalid code, error
-				array('googleanalytics_id' => 'UA-00-00'),
+				array('googleanalytics_id' => 'UA-00-00', 'googleanalytics_tag' => 1),
 				array('ACP_GOOGLEANALYTICS_ID_INVALID'),
 			),
 			array(
 				// invalid code, error
-				array('googleanalytics_id' => 'UA-00000-00000'),
+				array('googleanalytics_id' => 'UA-00000-00000', 'googleanalytics_tag' => 1),
 				array('ACP_GOOGLEANALYTICS_ID_INVALID'),
 			),
 			array(
 				// invalid code, error
-				array('googleanalytics_id' => 'AU-0000-00'),
+				array('googleanalytics_id' => 'AU-0000-00', 'googleanalytics_tag' => 1),
 				array('ACP_GOOGLEANALYTICS_ID_INVALID'),
 			),
 			array(
 				// invalid code, error
-				array('googleanalytics_id' => 'foo-bar-foo'),
+				array('googleanalytics_id' => 'foo-bar-foo', 'googleanalytics_tag' => 1),
 				array('ACP_GOOGLEANALYTICS_ID_INVALID'),
 			),
 			array(