From fbb2922c4d8ce1d746c14848c516eb31be320951 Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@automattic.com>
Date: Mon, 27 Sep 2021 12:53:08 -0600
Subject: [PATCH] [not verified] Modules Admin: Allow VideoPress module to be
 managed for any plan (#21200)

* Allow VideoPress module to be activated for any plan including free.

* Adding changelog entry.

Co-authored-by: Samiff <samiff@users.noreply.github.com>
---
 .../jetpack/changelog/update-videopress-enable-in-modules   | 4 ++++
 .../plugins/jetpack/class.jetpack-modules-list-table.php    | 6 ++----
 projects/plugins/jetpack/class.jetpack-plan.php             | 2 ++
 projects/plugins/jetpack/modules/videopress.php             | 2 --
 4 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-videopress-enable-in-modules

diff --git a/projects/plugins/jetpack/changelog/update-videopress-enable-in-modules b/projects/plugins/jetpack/changelog/update-videopress-enable-in-modules
new file mode 100644
index 0000000000000..e37e57a8a1518
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-videopress-enable-in-modules
@@ -0,0 +1,4 @@
+Significance: minor
+Type: bugfix
+
+VideoPress can now be managed on the Modules page for any plan type.
diff --git a/projects/plugins/jetpack/class.jetpack-modules-list-table.php b/projects/plugins/jetpack/class.jetpack-modules-list-table.php
index 82945aed78d48..004a2dffead6d 100644
--- a/projects/plugins/jetpack/class.jetpack-modules-list-table.php
+++ b/projects/plugins/jetpack/class.jetpack-modules-list-table.php
@@ -99,9 +99,7 @@ function js_templates() {
 				if ( item === undefined ) return; #>
 				<tr class="jetpack-module <# if ( ++i % 2 ) { #> alternate<# } #><# if ( item.activated ) { #> active<# } #><# if ( ! item.available ) { #> unavailable<# } #>" id="{{{ item.module }}}">
 					<th scope="row" class="check-column">
-						<# if ( 'videopress' !== item.module ) { #>
 						<input type="checkbox" name="modules[]" value="{{{ item.module }}}" />
-						<# } #>
 					</th>
 					<td class='name column-name'>
 						<span class='info'><a href="{{{item.learn_more_button}}}" target="blank">{{{ item.name }}}</a></span>
@@ -109,9 +107,9 @@ function js_templates() {
 						<# if ( item.configurable ) { #>
 							<span class='configure'>{{{ item.configurable }}}</span>
 						<# } #>
-						<# if ( item.activated && 'vaultpress' !== item.module && item.available && 'videopress' !== item.module ) { #>
+						<# if ( item.activated && 'vaultpress' !== item.module && item.available ) { #>
 							<span class='delete'><a href="<?php echo admin_url( 'admin.php' ); ?>?page=jetpack&#038;action=deactivate&#038;module={{{ item.module }}}&#038;_wpnonce={{{ item.deactivate_nonce }}}"><?php _e( 'Deactivate', 'jetpack' ); ?></a></span>
-						<# } else if ( item.available && 'videopress' !== item.module ) { #>
+						<# } else if ( item.available ) { #>
 							<span class='activate'><a href="<?php echo admin_url( 'admin.php' ); ?>?page=jetpack&#038;action=activate&#038;module={{{ item.module }}}&#038;_wpnonce={{{ item.activate_nonce }}}"><?php _e( 'Activate', 'jetpack' ); ?></a></span>
 						<# } #>
 						<# if ( ! item.available ) { #>
diff --git a/projects/plugins/jetpack/class.jetpack-plan.php b/projects/plugins/jetpack/class.jetpack-plan.php
index 5d3f575ee7b8f..889a0f7cfb3d4 100644
--- a/projects/plugins/jetpack/class.jetpack-plan.php
+++ b/projects/plugins/jetpack/class.jetpack-plan.php
@@ -46,6 +46,7 @@ class Jetpack_Plan {
 				'send-a-message',
 				'whatsapp-button',
 				'social-previews',
+				'videopress',
 
 				'core/video',
 				'core/cover',
@@ -64,6 +65,7 @@ class Jetpack_Plan {
 				'akismet',
 				'recurring-payments',
 				'premium-content/container',
+				'videopress',
 			),
 		),
 		'premium'  => array(
diff --git a/projects/plugins/jetpack/modules/videopress.php b/projects/plugins/jetpack/modules/videopress.php
index 1a3c37e24f0c7..eafc1b678a5e2 100644
--- a/projects/plugins/jetpack/modules/videopress.php
+++ b/projects/plugins/jetpack/modules/videopress.php
@@ -3,13 +3,11 @@
  * Module Name: VideoPress
  * Module Description: Save on hosting storage and bandwidth costs by streaming fast, ad-free video from our global network.
  * First Introduced: 2.5
- * Free: false
  * Requires Connection: Yes
  * Sort Order: 27
  * Module Tags: Photos and Videos
  * Feature: Writing
  * Additional Search Queries: video, videos, videopress, video gallery, video player, videoplayer, mobile video, vimeo, youtube, html5 video, stream
- * Plans: business, premium, security, complete
  */
 
 include_once dirname( __FILE__ ) . '/videopress/shortcode.php';