| @@ -1,7 +1,8 @@ | ||
| 1 | 1 | <?php //phpcs:ignore WordPress.Files.FileName.InvalidClassFileName |
| 2 | 2 | |
| 3 | 3 | use Automattic\Jetpack\Assets; |
| 4 | +use Automattic\Jetpack\Post_Media\Images; | |
| 4 | 5 | use Automattic\Jetpack\Stats\Tracking_Pixel as Stats_Tracking_Pixel; |
| 5 | 6 | use Automattic\Jetpack\Sync\Functions; |
| 6 | 7 | |
| 7 | 8 | /** |
| @@ -23,14 +24,8 @@ | ||
| 23 | 24 | ) { |
| 24 | 25 | add_action( 'amp_post_template_footer', array( 'Jetpack_AMP_Support', 'add_stats_pixel' ) ); |
| 25 | 26 | } |
| 26 | 27 | |
| 27 | - /** | |
| 28 | - * Remove this during the init hook in case users have enabled it during | |
| 29 | - * the after_setup_theme hook, which triggers before init. | |
| 30 | - */ | |
| 31 | - remove_theme_support( 'jetpack-devicepx' ); | |
| 32 | - | |
| 33 | 28 | // Sharing. |
| 34 | 29 | add_filter( 'jetpack_sharing_display_markup', array( 'Jetpack_AMP_Support', 'render_sharing_html' ), 10, 2 ); |
| 35 | 30 | add_filter( 'sharing_enqueue_scripts', array( 'Jetpack_AMP_Support', 'amp_disable_sharedaddy_css' ) ); |
| 36 | 31 | add_action( 'wp_enqueue_scripts', array( 'Jetpack_AMP_Support', 'amp_enqueue_sharing_css' ) ); |
| @@ -151,9 +146,9 @@ | ||
| 151 | 146 | * @param string $content Post content. |
| 152 | 147 | */ |
| 153 | 148 | public static function disable_comment_likes_before_the_content( $content ) { |
| 154 | 149 | if ( self::is_amp_request() ) { |
| 155 | - remove_filter( 'comment_text', 'comment_like_button', 12, 2 ); | |
| 150 | + remove_filter( 'comment_text', 'comment_like_button', 12 ); | |
| 156 | 151 | } |
| 157 | 152 | return $content; |
| 158 | 153 | } |
| 159 | 154 | |
| @@ -233,18 +228,27 @@ | ||
| 233 | 228 | * @param WP_Post $post Post. |
| 234 | 229 | * @return array Metadata. |
| 235 | 230 | */ |
| 236 | 231 | private static function add_image_to_metadata( $metadata, $post ) { |
| 237 | - $image = Jetpack_PostImages::get_image( | |
| 238 | - $post->ID, | |
| 239 | - array( | |
| 240 | - 'fallback_to_avatars' => true, | |
| 241 | - 'avatar_size' => 200, | |
| 242 | - // AMP already attempts these. | |
| 243 | - 'from_thumbnail' => false, | |
| 244 | - 'from_attachment' => false, | |
| 245 | - ) | |
| 232 | + $image_args = array( | |
| 233 | + 'fallback_to_avatars' => true, | |
| 234 | + 'avatar_size' => 200, | |
| 235 | + // AMP already attempts these. | |
| 236 | + 'from_thumbnail' => false, | |
| 237 | + 'from_attachment' => false, | |
| 246 | 238 | ); |
| 239 | + | |
| 240 | + // Every source left enabled above is parsed out of the body. | |
| 241 | + if ( \Automattic\Jetpack\SEO\Content_Gate::is_gated( $post ) ) { | |
| 242 | + $image_args += array( | |
| 243 | + 'from_slideshow' => false, | |
| 244 | + 'from_gallery' => false, | |
| 245 | + 'from_blocks' => false, | |
| 246 | + 'from_html' => false, | |
| 247 | + ); | |
| 248 | + } | |
| 249 | + | |
| 250 | + $image = Images::get_image( $post->ID, $image_args ); | |
| 247 | 251 | |
| 248 | 252 | if ( empty( $image ) ) { |
| 249 | 253 | return self::add_fallback_image_to_metadata( $metadata ); |
| 250 | 254 | } |
