From a9cd6976052c76ec3e96bd8ecac6abd8c58c8883 Mon Sep 17 00:00:00 2001 From: Dylan Munson <65001528+CodeyGuyDylan@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:08:08 -0700 Subject: [PATCH] Fix/standalone installation for all products (#35399) * Add product specific activation for backup * changelog * Remove custom active plugin check from Hybrid_Product * Update version * Update lockfiles * Remove outdated comment --- .../fix-standalone-installation-for-all-products | 4 ++++ .../src/products/class-hybrid-product.php | 13 ------------- .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ .../fix-standalone-installation-for-all-products | 5 +++++ 11 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 projects/packages/my-jetpack/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/backup/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/boost/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/jetpack/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/migration/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/protect/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/search/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/social/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/starter-plugin/changelog/fix-standalone-installation-for-all-products create mode 100644 projects/plugins/videopress/changelog/fix-standalone-installation-for-all-products diff --git a/projects/packages/my-jetpack/changelog/fix-standalone-installation-for-all-products b/projects/packages/my-jetpack/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..f2d1437787fb0 --- /dev/null +++ b/projects/packages/my-jetpack/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,4 @@ +Significance: minor +Type: fixed + +Fix issue where most products are not installing their standalone product upon purchase diff --git a/projects/packages/my-jetpack/src/products/class-hybrid-product.php b/projects/packages/my-jetpack/src/products/class-hybrid-product.php index 579e2524a2e23..27840aaff8657 100644 --- a/projects/packages/my-jetpack/src/products/class-hybrid-product.php +++ b/projects/packages/my-jetpack/src/products/class-hybrid-product.php @@ -15,10 +15,6 @@ * Class responsible for handling the hybrid products * * Hybrid products are those that may work both as a stand-alone plugin or with the Jetpack plugin. - * - * In case Jetpack plugin is active, it will not attempt to install its stand-alone plugin. - * - * But if Jetpack plugin is not active, then it will prompt to install and activate its stand-alone plugin. */ abstract class Hybrid_Product extends Product { @@ -47,15 +43,6 @@ public static function is_standalone_plugin_active() { return parent::is_plugin_active(); } - /** - * Checks whether the plugin is installed - * - * @return boolean - */ - public static function is_plugin_installed() { - return parent::is_plugin_installed() || static::is_jetpack_plugin_installed(); - } - /** * Checks whether the Jetpack module is active only if a module_name is defined * diff --git a/projects/plugins/backup/changelog/fix-standalone-installation-for-all-products b/projects/plugins/backup/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/changelog/fix-standalone-installation-for-all-products b/projects/plugins/boost/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/changelog/fix-standalone-installation-for-all-products b/projects/plugins/jetpack/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/changelog/fix-standalone-installation-for-all-products b/projects/plugins/migration/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/changelog/fix-standalone-installation-for-all-products b/projects/plugins/protect/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/changelog/fix-standalone-installation-for-all-products b/projects/plugins/search/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/changelog/fix-standalone-installation-for-all-products b/projects/plugins/social/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/changelog/fix-standalone-installation-for-all-products b/projects/plugins/starter-plugin/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/changelog/fix-standalone-installation-for-all-products b/projects/plugins/videopress/changelog/fix-standalone-installation-for-all-products new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/fix-standalone-installation-for-all-products @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + +