← All changes | extensions/blocks/subscriptions/subscriptions.php +3 -2 16.2 → 16.3-a.7 View file →

		@@ -240,9 +240,10 @@
240	240	}
241	241
242	242	$access_level = get_post_meta( $post_id, META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS, true );
243	243
244		- $is_paywalled = false;
	244	+ // A Paywall block gates the post whatever the stored access level; see Jetpack_Memberships::get_post_access_level().
	245	+ $is_paywalled = has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME, $post );
245	246	switch ( $access_level ) {
246	247	case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
247	248	case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS:
248	249	case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS:
		@@ -266,9 +267,9 @@
266	267	if ( NEWSLETTER_COLUMN_ID !== $column_id ) {
267	268	return;
268	269	}
269	270
270		- $access_level = get_post_meta( $post_id, META_NAME_FOR_POST_LEVEL_ACCESS_SETTINGS, true );
	271	+ $access_level = Jetpack_Memberships::get_post_access_level( $post_id );
271	272
272	273	switch ( $access_level ) {
273	274	case Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS:
274	275	echo esc_html__( 'Paid Subscribers (all plans)', 'jetpack' );