My Jetpack: Activate plugins in normal mode (#25727)

* Activate plugins in normal mode * remove old comment * bump versions Co-authored-by: sdixon194 <[email protected]>
Automattic · Aug 23, 2022 · b8d569d · b8d569d
1 parent 4e835c0
commit b8d569d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-activate-plugins b/projects/packages/my-jetpack/changelog/update-my-jetpack-activate-plugins
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Activate plugins in normal mode to trigger plugin_activated hooks
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "2.0.1",
+	"version": "2.0.2-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -29,7 +29,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '2.0.1';
+	const PACKAGE_VERSION = '2.0.2-alpha';
 
 	/**
 	 * Initialize My Jetapack

diff --git a/projects/packages/my-jetpack/src/products/class-extras.php b/projects/packages/my-jetpack/src/products/class-extras.php
@@ -135,9 +135,6 @@ public static function get_manage_url() {
 	 * @return null|WP_Error Null on success, WP_Error on invalid file.
 	 */
 	public static function activate_plugin() {
-		/*
-		 * Silent mode True to avoid redirect
-		 */
-		return activate_plugin( static::get_installed_plugin_filename( 'jetpack' ), '', false, true );
+		return activate_plugin( static::get_installed_plugin_filename( 'jetpack' ) );
 	}
 }
diff --git a/projects/packages/my-jetpack/src/products/class-hybrid-product.php b/projects/packages/my-jetpack/src/products/class-hybrid-product.php
@@ -69,11 +69,9 @@ public static function is_active() {
 	public static function activate_plugin() {
 		/*
 		 * Activate self-installed plugin if it's installed.
-		 * Silent mode True to avoid redirects in Backup.
-		 * @TODO When new Hybrid products are added, we might not want to go silent with all of them.
 		 */
 		if ( parent::is_plugin_installed() ) {
-			return activate_plugin( static::get_installed_plugin_filename(), '', false, true );
+			return activate_plugin( static::get_installed_plugin_filename() );
 		}
 
 		/*