Merge pull request #198 from mailjet/version_update

Version update

README.md

@@ -3,8 +3,8 @@
 - Contributors: Mailjet
 - Tags: email, marketing, signup, newsletter, widget, smtp, mailjet
 - Requires at least: 3.9
-- Tested up to: 5.1.1
-- Stable tag: 5.0.12
+- Tested up to: 5.2
+- Stable tag: 5.1
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -172,6 +172,12 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 ## Changelog
 
+##### 5.1
+* New integration with Contact Form 7 has been added
+* Added support for custom translation files
+* Multiple widgets can be added on the same page
+* Various bug fixes and improvements
+
 ##### 5.0.12
 * User can upload custom language translation files
 * Added Contact Form 7 integration

readme.txt

@@ -3,8 +3,8 @@
 Contributors: Mailjet
 Tags: email, marketing, signup, newsletter, widget, smtp, mailjet
 Requires at least: 3.9
-Tested up to: 5.1.1
-Stable tag: 5.0.12
+Tested up to: 5.2
+Stable tag: 5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -181,6 +181,12 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 == Changelog ==
 
+= 5.1 =
+* New integration with Contact Form 7 has been added
+* Added support for custom translation files
+* Multiple widgets can be added on the same page
+* Various bug fixes and improvements
+
 = 5.0.12 =
 * User can upload custom language translation files
 * Added Contact Form 7 integration

src/includes/Mailjet.php

@@ -70,7 +70,7 @@ public function __construct()
         if (defined('MAILJET_VERSION')) {
             $this->version = MAILJET_VERSION;
         } else {
-            $this->version = '5.0.12';
+            $this->version = '5.1';
         }
         $this->plugin_name = 'mailjet';
 

src/includes/SettingsPages/InitialContactListsSettings.php

@@ -66,9 +66,6 @@ public function mailjet_initial_contact_lists_cb($args)
 
         $mailjetContactLists = !empty($mailjetContactLists) ? $mailjetContactLists : array();
         $mailjetSyncActivated = get_option('activate_mailjet_sync');
-        if (!$mailjetSyncActivated) {
-            $mailjetSyncActivated = update_option('activate_mailjet_sync', 1);
-        }
         $mailjetInitialSyncActivated = get_option('activate_mailjet_initial_sync');
         $mailjetSyncList = get_option('mailjet_sync_list');
 
@@ -88,7 +85,7 @@ public function mailjet_initial_contact_lists_cb($args)
                                     <span><?php echo __('Automatically add all my future Wordpress subscribers to a specific contact list', 'mailjet-for-wordpress'); ?></span>
                                 </label>-->
 
-                <div id="activate_mailjet_sync_form" class="<?= ($mailjetSyncActivated == 1 ? ' mj-show' : 'mj-hide') ?>">
+                <div id="activate_mailjet_sync_form" class="mj-show">
                     <div class="mailjet_sync_options_div">
                         <h4><?php _e('Your Mailjet contact lists', 'mailjet-for-wordpress'); ?></h4>
                         <select class="mj-select" name="mailjet_sync_list" id="mailjet_sync_list" type="select">

wp-mailjet.php

@@ -14,7 +14,7 @@
  * Plugin Name:       Mailjet for WordPress
  * Plugin URI:        https://www.mailjet.com/partners/wordpress/
  * Description:       The Best WordPress Plugin For Email Newsletters.
- * Version:           5.0.12
+ * Version:           5.1
  * Author:            Mailjet SAS
  * Author URI:        http://mailjet.com
  * License:           GPL-2.0+
@@ -54,7 +54,7 @@
 /**
  * Mailjet plugin version.
  */
-define('MAILJET_VERSION', '5.0.12');
+define('MAILJET_VERSION', '5.1');
 
 /**
  * Mailjet Plugid dir.