Ads: Deactivate module if plan changes (#6242)

* Deactivate Ads if plan changes to no longer support it * Updated to use $to_deactivate instead of deactivate_module
Automattic · Feb 1, 2017 · 9d5b9ca · 9d5b9ca
1 parent 019fa37
commit 9d5b9ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/_inc/lib/admin-pages/class.jetpack-admin-page.php b/_inc/lib/admin-pages/class.jetpack-admin-page.php
@@ -216,11 +216,11 @@ function check_plan_deactivate_modules( $page ) {
 				$active = Jetpack::get_active_modules();
 				switch ( $current->plan->product_slug ) {
 					case 'jetpack_free':
-						$to_deactivate = array( 'seo-tools', 'videopress', 'google-analytics' );
+						$to_deactivate = array( 'seo-tools', 'videopress', 'google-analytics', 'wordads' );
 						break;
 					case 'jetpack_personal':
 					case 'jetpack_personal_monthly':
-						$to_deactivate = array( 'seo-tools', 'videopress', 'google-analytics' );
+						$to_deactivate = array( 'seo-tools', 'videopress', 'google-analytics', 'wordads' );
 						break;
 					case 'jetpack_premium':
 					case 'jetpack_premium_monthly':

diff --git a/class.jetpack.php b/class.jetpack.php
@@ -1246,6 +1246,7 @@ public static function get_active_plan() {
 				'videopress',
 				'akismet',
 				'vaultpress',
+				'wordads',
 			);
 		}
 
@@ -1262,6 +1263,7 @@ public static function get_active_plan() {
 				'vaultpress',
 				'seo-tools',
 				'google-analytics',
+				'wordads',
 			);
 		}