Merge pull request #4296 from ampproject/enforce-utf8-content-type-header

westonruter · web-flow · commit b8ccb9759647 · 2020-02-17T08:45:08.000-08:00
Enfore UTF-8 content-type header
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
@@ -2055,6 +2055,11 @@ public static function prepare_response( $response, $args = [] ) {
 			return $response;
 		}
 
+		// Enforce UTF-8 encoding as it is a requirement for AMP.
+		if ( ! headers_sent() ) {
+			header( 'Content-Type: text/html; charset=utf-8' );
+		}
+
 		/**
 		 * Filters whether response (post-processor) caching is enabled.
 		 *
@@ -2356,12 +2361,6 @@ public static function prepare_response( $response, $args = [] ) {
 			}
 		}
 
-		// @todo If 'utf-8' is not the blog charset, then we'll need to do some character encoding conversation or "entityification".
-		if ( 'utf-8' !== strtolower( get_bloginfo( 'charset' ) ) ) {
-			/* translators: %s: the charset of the current site. */
-			trigger_error( esc_html( sprintf( __( 'The database has the %s encoding when it needs to be utf-8 to work with AMP.', 'amp' ), get_bloginfo( 'charset' ) ) ), E_USER_WARNING ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-		}
-
 		AMP_Validation_Manager::finalize_validation( $dom );
 
 		$response  = "<!DOCTYPE html>\n";

Original file line number	Diff line number	Diff line change
`@@ -2055,6 +2055,11 @@ public static function prepare_response( $response, $args = [] ) {`
`2055`	`2055`	`return $response;`
`2056`	`2056`	`}`
`2057`	`2057`
	`2058`	`+ // Enforce UTF-8 encoding as it is a requirement for AMP.`
	`2059`	`+ if ( ! headers_sent() ) {`
	`2060`	`+ header( 'Content-Type: text/html; charset=utf-8' );`
	`2061`	`+ }`
	`2062`	`+`
`2058`	`2063`	`/**`
`2059`	`2064`	`* Filters whether response (post-processor) caching is enabled.`
`2060`	`2065`	`*`
`@@ -2356,12 +2361,6 @@ public static function prepare_response( $response, $args = [] ) {`
`2356`	`2361`	`}`
`2357`	`2362`	`}`
`2358`	`2363`
`2359`		`- // @todo If 'utf-8' is not the blog charset, then we'll need to do some character encoding conversation or "entityification".`
`2360`		`- if ( 'utf-8' !== strtolower( get_bloginfo( 'charset' ) ) ) {`
`2361`		`- /* translators: %s: the charset of the current site. */`
`2362`		`- trigger_error( esc_html( sprintf( __( 'The database has the %s encoding when it needs to be utf-8 to work with AMP.', 'amp' ), get_bloginfo( 'charset' ) ) ), E_USER_WARNING ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error`
`2363`		`- }`
`2364`		`-`
`2365`	`2364`	`AMP_Validation_Manager::finalize_validation( $dom );`
`2366`	`2365`
`2367`	`2366`	`$response = "<!DOCTYPE html>\n";`