Merge pull request #379 from mailjet/plugin-fixes

Fix for the possible error in scope of multisites
mailjet · Oct 1, 2024 · 4dc9627 · 4dc9627
2 parents fd06989 + 92c3456
commit 4dc9627
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+##### 6.1.2
+ - Fix possible error when code switch websites and could leave website in a broken state
+
 ##### 6.1.1
 - Fix PHP Fatal error:  Uncaught Error: Class 'MailjetWp\\MailjetPlugin\\Front\\Mailjet
 

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 - Contributors: Mailjet
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
-- Tested up to: 6.6.1
-- Stable tag: 6.1.1
+- Tested up to: 6.6.2
+- Stable tag: 6.1.2
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -162,6 +162,9 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 ## Changelog
 
+##### 6.1.2
+- Fix possible error when code switch websites and could leave website in a broken state
+
 ##### 6.1
  - Added support Multisite settings across all sites. Now, you can use plugin settings from the main site on all your subdomains.
 

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@
 - Contributors: Mailjet
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
-- Tested up to: 6.6.1
-- Stable tag: 6.1.1
+- Tested up to: 6.6.2
+- Stable tag: 6.1.2
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -152,6 +152,9 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 == Changelog ==
 
+= 6.1.2 =
+ - Fix possible error when code switch websites and could leave website in a broken state
+
 = 6.0.1 =
 * Removed old widget filter function `mailjet_subscription_widget_email_params`. It was deprecated and unsupported since we have Form Builder widget
 

diff --git a/src/includes/Mailjet.php b/src/includes/Mailjet.php
@@ -63,7 +63,7 @@ public function __construct()
         if (\defined('MAILJET_VERSION')) {
             $this->version = MAILJET_VERSION;
         } else {
-            $this->version = '6.1.1';
+            $this->version = '6.1.2';
         }
         $this->plugin_name = 'mailjet';
         $this->load_dependencies();
@@ -300,7 +300,9 @@ public static function getOption(string $key)
 
         //If main site has multisite support enabled, we should use the main site options
         if (get_option('mailjet_multisite_support') === 'on') {
-            return get_option($key);
+            $optionValue = get_option($key);
+            restore_current_blog();
+            return $optionValue;
         }
         //If main site has multisite support disabled, we should use the current site options
         restore_current_blog();

diff --git a/wp-mailjet.php b/wp-mailjet.php
@@ -14,8 +14,8 @@
  * Plugin Name:       Mailjet for WordPress
  * Plugin URI:        https://www.mailjet.com/partners/wordpress/
  * Description:       The Best WordPress Plugin For Email Newsletters.
- * Version:           6.1.1
- * Tested up to:      6.6.1
+ * Version:           6.1.2
+ * Tested up to:      6.6.2
  * Author:            Mailjet SAS
  * Author URI:        http://mailjet.com
  * License:           GPL-2.0+
@@ -56,7 +56,7 @@
 /**
  * Mailjet plugin version.
  */
-define('MAILJET_VERSION', '6.1.1');
+define('MAILJET_VERSION', '6.1.2');
 
 /**
  * Mailjet Plugid dir.