Fix VideoPress and Memberships privacy setting override (#34189)

* Fix memberships getting precedence when it shouldn't.
Automattic · Nov 17, 2023 · a07d561 · a07d561
1 parent b62f68f
commit a07d561
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/projects/packages/videopress/changelog/fix-videopress-gated-memberships-precedence b/projects/packages/videopress/changelog/fix-videopress-gated-memberships-precedence
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix interaction with memberships and VideoPress privacy.
diff --git a/projects/packages/videopress/src/class-access-control.php b/projects/packages/videopress/src/class-access-control.php
@@ -145,9 +145,12 @@ private function build_restriction_details( $guid, $embedded_post_id, $selected_
 		$restriction_details = $this->default_video_restriction_details( $default_auth );
 
 		if ( $this->jetpack_memberships_available() ) {
-			$memberships_can_view_post         = \Jetpack_Memberships::user_can_view_post( $embedded_post_id );
-			$restriction_details               = $this->get_subscriber_only_restriction_details( $default_auth );
-			$restriction_details['can_access'] = $memberships_can_view_post;
+			$post_access_level = \Jetpack_Memberships::get_post_access_level( $embedded_post_id );
+			if ( 'everybody' !== $post_access_level ) {
+				$memberships_can_view_post         = \Jetpack_Memberships::user_can_view_post( $embedded_post_id );
+				$restriction_details               = $this->get_subscriber_only_restriction_details( $default_auth );
+				$restriction_details['can_access'] = $memberships_can_view_post;
+			}
 		}
 
 		return $this->check_block_level_access(