← All changes | modules/memberships/class-jetpack-memberships.php +3 -33 16.3 → 16.3-beta View file →

		@@ -825,31 +825,8 @@
825	825	*
826	826	* @return bool Whether the post can be viewed
827	827	*/
828	828	public static function user_can_view_post( $post_id = null ) {
829		- return self::check_post_access( $post_id, true );
830		- }
831		-
832		- /**
833		- * Check the post's subscription requirement without granting access for editing it.
834		- *
835		- * @since $$next-version$$
836		- *
837		- * @param int|null $post_id Explicit post ID, or the loop post when omitted.
838		- * @return bool Whether the visitor meets the post's subscription requirement.
839		- */
840		- public static function user_has_subscription_access( $post_id = null ) {
841		- return self::check_post_access( $post_id, false );
842		- }
843		-
844		- /**
845		- * Evaluate and cache post access with or without the editorial exception.
846		- *
847		- * @param int|null $post_id Post to check.
848		- * @param bool $allow_editor_access Whether editing the post can grant access.
849		- * @return bool Whether access is granted.
850		- */
851		- private static function check_post_access( $post_id, $allow_editor_access ) {
852	829	$user_id = get_current_user_id();
853	830	if ( null === $post_id ) {
854	831	$post_id = get_the_ID();
855	832	}
		@@ -857,9 +834,9 @@
857	834	if ( false === $post_id ) {
858	835	$post_id = 0;
859	836	}
860	837
861		- $cache_key = sprintf( '%d_%d_%d', $user_id, $post_id, (int) $allow_editor_access );
	838	+ $cache_key = sprintf( '%d_%d', $user_id, $post_id );
862	839	if ( isset( self::$user_can_view_post_cache[ $cache_key ] ) ) {
863	840	return self::$user_can_view_post_cache[ $cache_key ];
864	841	}
865	842
		@@ -869,9 +846,9 @@
869	846	return true;
870	847	}
871	848
872	849	// we are sending the post to subscribers so the user is a subscriber
873		- if ( $allow_editor_access && defined( 'WPCOM_SENDING_POST_TO_SUBSCRIBERS' ) && WPCOM_SENDING_POST_TO_SUBSCRIBERS && Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS === $post_access_level ) {
	850	+ if ( defined( 'WPCOM_SENDING_POST_TO_SUBSCRIBERS' ) && WPCOM_SENDING_POST_TO_SUBSCRIBERS && Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS === $post_access_level ) {
874	851	self::$user_can_view_post_cache[ $cache_key ] = true;
875	852	return true;
876	853	}
877	854
		@@ -890,16 +867,9 @@
890	867	// We downgrade the post level to subscribers-only
891	868	$post_access_level = Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS;
892	869	}
893	870
894		- // Pass the post explicitly: callers outside the loop have no get_the_ID() to fall back on.
895		- if ( $allow_editor_access ) {
896		- // @phan-suppress-next-line PhanParamTooMany -- Concrete services accept the optional $post_id; interface omits it on purpose.
897		- $can_view_post = $paywall->visitor_can_view_content( $all_newsletters_plan_ids, $post_access_level, $post_id );
898		- } else {
899		- $can_view_post = is_callable( array( $paywall, 'visitor_has_subscription_access' ) )
900		- && $paywall->visitor_has_subscription_access( $all_newsletters_plan_ids, $post_access_level, $post_id );
901		- }
	871	+ $can_view_post = $paywall->visitor_can_view_content( $all_newsletters_plan_ids, $post_access_level );
902	872
903	873	self::$user_can_view_post_cache[ $cache_key ] = $can_view_post;
904	874	return $can_view_post;
905	875	}