Fix generation of AMP permalink for attachments

ampproject · Jul 2, 2018 · 7091b35 · 7091b35
1 parent acf9849
commit 7091b35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
@@ -123,6 +123,9 @@ function amp_get_permalink( $post_id ) {
 			||
 			// If the post type is hierarchical then the /amp/ endpoint isn't available.
 			is_post_type_hierarchical( get_post_type( $post_id ) )
+			||
+			// Attachment pages don't accept the /amp/ endpoint.
+			'attachment' === get_post_type( $post_id )
 		);
 		if ( $use_query_var ) {
 			$amp_url = add_query_arg( amp_get_slug(), '', $permalink );

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
@@ -172,6 +172,7 @@ public static function read_theme_support() {
 				// Validate theme support usage.
 				$keys = array( 'template_dir', 'comments_live_list', 'mode', 'optional', 'templates_supported', 'available_callback' );
 				if ( ! is_array( self::$initial_theme_support_args ) ) {
+					self::$initial_theme_support_args = array();
 					_doing_it_wrong( 'add_theme_support', esc_html__( 'Expected AMP theme support arg to be array.', 'amp' ), '1.0' ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
 				} elseif ( count( array_diff( array_keys( self::$initial_theme_support_args ), $keys ) ) !== 0 ) {
 					_doing_it_wrong( 'add_theme_support', esc_html( sprintf(  // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error