Prevent wp_print_service_workers() from happening at wp_print_footer_scripts in legacy Reader mode (#5270)

Author: westonruter

includes/class-amp-service-worker.php

@@ -243,27 +243,20 @@ public static function get_precached_script_cdn_urls() {
 	 * Add hooks to install the service worker from AMP page.
 	 */
 	public static function add_install_hooks() {
-		if ( ! amp_is_legacy() && amp_is_request() ) {
-			add_action( 'wp_footer', [ __CLASS__, 'install_service_worker' ] );
-
-			// Prevent validation error due to the script that installs the service worker on non-AMP pages.
-			foreach ( [ 'wp_print_scripts', 'wp_print_footer_scripts' ] as $action ) {
-				$priority = has_action( $action, 'wp_print_service_workers' );
-				if ( false !== $priority ) {
-					remove_action( $action, 'wp_print_service_workers', $priority );
-				}
+		if ( ! amp_is_request() ) {
+			return;
+		}
+
+		// Prevent validation error due to the script that installs the service worker on non-AMP pages.
+		foreach ( [ 'wp_print_scripts', 'wp_print_footer_scripts' ] as $action ) {
+			$priority = has_action( $action, 'wp_print_service_workers' );
+			if ( false !== $priority ) {
+				remove_action( $action, 'wp_print_service_workers', $priority );
 			}
 		}
 
-		// Reader mode integration.
+		add_action( 'wp_footer', [ __CLASS__, 'install_service_worker' ] );
 		add_action( 'amp_post_template_footer', [ __CLASS__, 'install_service_worker' ] );
-		add_filter(
-			'amp_post_template_data',
-			static function ( $data ) {
-				$data['amp_component_scripts']['amp-install-serviceworker'] = true;
-				return $data;
-			}
-		);
 	}
 
 	/**

tests/php/test-class-amp-service-worker.php

@@ -197,8 +197,9 @@ public function test_add_install_hooks() {
 		$post_id = self::factory()->post->create();
 		$this->go_to( get_permalink( $post_id ) );
 
+		$this->assertFalse( amp_is_request() );
 		AMP_Service_Worker::add_install_hooks();
-		$this->assertSame( 10, has_action( 'amp_post_template_footer', [ 'AMP_Service_Worker', 'install_service_worker' ] ) );
+		$this->assertFalse( has_action( 'amp_post_template_footer', [ 'AMP_Service_Worker', 'install_service_worker' ] ) );
 		$this->assertFalse( has_action( 'wp_footer', [ 'AMP_Service_Worker', 'install_service_worker' ] ) );
 
 		AMP_Options_Manager::update_option( Option::THEME_SUPPORT, AMP_Theme_Support::STANDARD_MODE_SLUG );