Merge pull request #1252 from google/hotfix/1251-amp-validation

Fix AMP validation when tracking is disabled
google · Mar 16, 2020 · 9d1e01a · 9d1e01a
2 parents 1a91ac9 + 8e30592
commit 9d1e01a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/assets/sass/components/global/_googlesitekit-noscript.scss b/assets/sass/components/global/_googlesitekit-noscript.scss
@@ -29,7 +29,7 @@
 	}
 }
 
-.no-js {
+.no-js:not([amp-version]) {
 
 	[id^="js-googlesitekit-"] {
 		display: none;

diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
@@ -381,7 +381,7 @@ protected function print_amp_gtag() {
 		}
 
 		$gtag_amp_opt = array(
-			'vars' => array(
+			'vars'            => array(
 				'gtag_id' => $tracking_id,
 				'config'  => array(
 					$tracking_id => array(
@@ -392,6 +392,7 @@ protected function print_amp_gtag() {
 					),
 				),
 			),
+			'optoutElementId' => '__gaOptOutExtension',
 		);
 
 		/**
@@ -1273,7 +1274,11 @@ private function get_home_domain() {
 	private function print_tracking_opt_out() {
 		?>
 		<!-- <?php esc_html_e( 'Google Analytics user opt-out added via Site Kit by Google', 'google-site-kit' ); ?> -->
-		<script type="text/javascript">window["_gaUserPrefs"] = { ioo : function() { return true; } }</script>
+		<?php if ( $this->context->is_amp() ) : ?>
+			<script type="application/ld+json" id="__gaOptOutExtension"></script>
+		<?php else : ?>
+			<script type="text/javascript">window["_gaUserPrefs"] = { ioo : function() { return true; } }</script>
+		<?php endif; ?>
 		<?php
 	}
 

diff --git a/includes/Modules/Tag_Manager.php b/includes/Modules/Tag_Manager.php
@@ -302,9 +302,20 @@ protected function print_amp_gtm() {
 			return;
 		}
 
+		// Add the optoutElementId for compatibility with our Analytics opt-out mechanism.
+		// This configuration object will be merged with the configuration object returned
+		// by the `config` attribute URL.
+		$gtm_amp_opt = array(
+			'optoutElementId' => '__gaOptOutExtension',
+		);
+
 		?>
 		<!-- Google Tag Manager added by Site Kit -->
-		<amp-analytics config="<?php echo esc_url( "https://www.googletagmanager.com/amp.json?id=$container_id" ); ?>" data-credentials="include"></amp-analytics>
+		<amp-analytics config="<?php echo esc_url( "https://www.googletagmanager.com/amp.json?id=$container_id" ); ?>" data-credentials="include">
+			<script type="application/json">
+				<?php echo wp_json_encode( $gtm_amp_opt ); ?>
+			</script>
+		</amp-analytics>
 		<!-- End Google Tag Manager -->
 		<?php
 	}