MailChimp for WordPress - Version 4.6.1

Version Description

Download this release

Release Info

Developer DvanKooten
Plugin Icon 128x128 MailChimp for WordPress
Version 4.6.1
Comparing to
See all releases

Code changes from version 4.6.0 to 4.6.1

CHANGELOG.md CHANGED
@@ -1,6 +1,13 @@
1
  Changelog
2
  =========
3
 
 
 
 
 
 
 
 
4
  #### 4.6.0 - Oct 7, 2019
5
 
6
  **Improvements**
1
  Changelog
2
  =========
3
 
4
+ #### 4.6.1 - Oct 7, 2019
5
+
6
+ **Fixes**
7
+
8
+ - Fixed list cache usage for WPForms, Gravity Forms and Ninja Forms integrations.
9
+
10
+
11
  #### 4.6.0 - Oct 7, 2019
12
 
13
  **Improvements**
integrations/gravity-forms/class-gravity-forms.php CHANGED
@@ -91,9 +91,9 @@ class MC4WP_Gravity_Forms_Integration extends MC4WP_Integration
91
  if ($pos !== 0) {
92
  return;
93
  }
94
-
95
  $mailchimp = new MC4WP_MailChimp();
96
- $lists = $mailchimp->get_cached_lists(); ?>
97
  <li class="mailchimp_list_setting field_setting">
98
  <label for="field_mailchimp_list" class="section_label">
99
  <?php esc_html_e('Mailchimp list', 'mailchimp-for-wp'); ?>
91
  if ($pos !== 0) {
92
  return;
93
  }
94
+
95
  $mailchimp = new MC4WP_MailChimp();
96
+ $lists = $mailchimp->get_lists(); ?>
97
  <li class="mailchimp_list_setting field_setting">
98
  <label for="field_mailchimp_list" class="section_label">
99
  <?php esc_html_e('Mailchimp list', 'mailchimp-for-wp'); ?>
integrations/ninja-forms/class-action.php CHANGED
@@ -106,10 +106,9 @@ final class MC4WP_Ninja_Forms_Action extends NF_Abstracts_ActionNewsletter
106
  $list_id = $action_settings['newsletter_list'];
107
  $email_address = $action_settings['EMAIL'];
108
  $mailchimp = new MC4WP_MailChimp();
109
- $list = $mailchimp->get_list($list_id, true);
110
 
111
- $merge_fields = array();
112
- foreach ($list->merge_fields as $merge_field) {
113
  if (! empty($action_settings[ $merge_field->tag ])) {
114
  $merge_fields[ $merge_field->tag ] = $action_settings[ $merge_field->tag ];
115
  }
@@ -126,24 +125,21 @@ final class MC4WP_Ninja_Forms_Action extends NF_Abstracts_ActionNewsletter
126
  {
127
  $mailchimp = new MC4WP_MailChimp();
128
 
129
- /** @var MC4WP_MailChimp_List[] $lists */
130
  $lists = $mailchimp->get_lists();
131
  $return = array();
132
 
133
  foreach ($lists as $list) {
134
  $list_fields = array();
135
- foreach ($list->merge_fields as $merge_field) {
 
136
  $list_fields[] = array(
137
  'value' => $merge_field->tag,
138
  'label' => $merge_field->name,
139
  );
140
  }
141
 
142
- // TODO: Add support for groups once base class supports this.
143
- // $list_groups = array();
144
- // foreach( $list->interest_categories as $category ) {
145
- //
146
- // }
147
 
148
  $return[] = array(
149
  'value' => $list->id,
106
  $list_id = $action_settings['newsletter_list'];
107
  $email_address = $action_settings['EMAIL'];
108
  $mailchimp = new MC4WP_MailChimp();
 
109
 
110
+ $merge_fields = $mailchimp->get_list_merge_fields($list_id);
111
+ foreach ($merge_fields as $merge_field) {
112
  if (! empty($action_settings[ $merge_field->tag ])) {
113
  $merge_fields[ $merge_field->tag ] = $action_settings[ $merge_field->tag ];
114
  }
125
  {
126
  $mailchimp = new MC4WP_MailChimp();
127
 
128
+ /** @var array $lists */
129
  $lists = $mailchimp->get_lists();
130
  $return = array();
131
 
132
  foreach ($lists as $list) {
133
  $list_fields = array();
134
+
135
+ foreach ($mailchimp->get_list_merge_fields($list->id) as $merge_field) {
136
  $list_fields[] = array(
137
  'value' => $merge_field->tag,
138
  'label' => $merge_field->name,
139
  );
140
  }
141
 
142
+ // TODO: Add support for groups once base class supports this.
 
 
 
 
143
 
144
  $return[] = array(
145
  'value' => $list->id,
integrations/wpforms/class-field.php CHANGED
@@ -102,7 +102,7 @@ class MC4WP_WPForms_Field extends WPForms_Field
102
  );
103
 
104
  $option_select = sprintf('<select name="fields[%s][mailchimp_list]" data-field-id="%d" data-field-type="%s">', $field['id'], $field['id'], $this->type);
105
- $lists = $mailchimp->get_cached_lists();
106
  foreach ($lists as $list) {
107
  $option_select .= sprintf('<option value="%s" %s>%s</option>', $list->id, selected($list->id, $field['mailchimp_list'], false), $list->name);
108
  }
102
  );
103
 
104
  $option_select = sprintf('<select name="fields[%s][mailchimp_list]" data-field-id="%d" data-field-type="%s">', $field['id'], $field['id'], $this->type);
105
+ $lists = $mailchimp->get_lists();
106
  foreach ($lists as $list) {
107
  $option_select .= sprintf('<option value="%s" %s>%s</option>', $list->id, selected($list->id, $field['mailchimp_list'], false), $list->name);
108
  }
languages/mailchimp-for-wp-af_ZA.mo CHANGED
Binary file
languages/mailchimp-for-wp-es.mo CHANGED
Binary file
languages/mailchimp-for-wp-es_PR.mo CHANGED
Binary file
languages/mailchimp-for-wp-gl_ES.mo CHANGED
Binary file
languages/mailchimp-for-wp-he_IL.mo CHANGED
Binary file
languages/mailchimp-for-wp-ms_MY.mo CHANGED
Binary file
languages/mailchimp-for-wp-ro_RO.mo CHANGED
Binary file
languages/mailchimp-for-wp-sk_SK.mo CHANGED
Binary file
languages/mailchimp-for-wp-sr_RS.mo CHANGED
Binary file
languages/mailchimp-for-wp-sw_KE.mo CHANGED
Binary file
languages/mailchimp-for-wp-th_TH.mo CHANGED
Binary file
languages/mailchimp-for-wp-zh_CN.mo CHANGED
Binary file
languages/mailchimp-for-wp-zh_HK.mo CHANGED
Binary file
languages/mailchimp-for-wp-zh_TW.mo CHANGED
Binary file
mailchimp-for-wp.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: MC4WP: Mailchimp for WordPress
4
  Plugin URI: https://mc4wp.com/#utm_source=wp-plugin&utm_medium=mailchimp-for-wp&utm_campaign=plugins-page
5
  Description: Mailchimp for WordPress by ibericode. Adds various highly effective sign-up methods to your site.
6
- Version: 4.6.0
7
  Author: ibericode
8
  Author URI: https://ibericode.com/
9
  Text Domain: mailchimp-for-wp
@@ -41,7 +41,7 @@ function _mc4wp_load_plugin()
41
  }
42
 
43
  // bootstrap the core plugin
44
- define('MC4WP_VERSION', '4.6.0');
45
  define('MC4WP_PLUGIN_DIR', dirname(__FILE__) . '/');
46
  define('MC4WP_PLUGIN_URL', plugins_url('/', __FILE__));
47
  define('MC4WP_PLUGIN_FILE', __FILE__);
3
  Plugin Name: MC4WP: Mailchimp for WordPress
4
  Plugin URI: https://mc4wp.com/#utm_source=wp-plugin&utm_medium=mailchimp-for-wp&utm_campaign=plugins-page
5
  Description: Mailchimp for WordPress by ibericode. Adds various highly effective sign-up methods to your site.
6
+ Version: 4.6.1
7
  Author: ibericode
8
  Author URI: https://ibericode.com/
9
  Text Domain: mailchimp-for-wp
41
  }
42
 
43
  // bootstrap the core plugin
44
+ define('MC4WP_VERSION' ,'4.6.1');
45
  define('MC4WP_PLUGIN_DIR', dirname(__FILE__) . '/');
46
  define('MC4WP_PLUGIN_URL', plugins_url('/', __FILE__));
47
  define('MC4WP_PLUGIN_FILE', __FILE__);
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://mc4wp.com/#utm_source=wp-plugin-repo&utm_medium=mailchimp-f
4
  Tags: mailchimp, mc4wp, email, marketing, newsletter, subscribe, widget, mc4wp, contact form 7, woocommerce, buddypress, ibericode, mailchimp form
5
  Requires at least: 4.1
6
  Tested up to: 5.2
7
- Stable tag: 4.6.0
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
  Requires PHP: 5.3
@@ -197,6 +197,13 @@ The plugin provides various filter & action hooks that allow you to modify or ex
197
  == Changelog ==
198
 
199
 
 
 
 
 
 
 
 
200
  #### 4.6.0 - Oct 7, 2019
201
 
202
  **Improvements**
4
  Tags: mailchimp, mc4wp, email, marketing, newsletter, subscribe, widget, mc4wp, contact form 7, woocommerce, buddypress, ibericode, mailchimp form
5
  Requires at least: 4.1
6
  Tested up to: 5.2
7
+ Stable tag: 4.6.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
  Requires PHP: 5.3
197
  == Changelog ==
198
 
199
 
200
+ #### 4.6.1 - Oct 7, 2019
201
+
202
+ **Fixes**
203
+
204
+ - Fixed list cache usage for WPForms, Gravity Forms and Ninja Forms integrations.
205
+
206
+
207
  #### 4.6.0 - Oct 7, 2019
208
 
209
  **Improvements**
vendor/autoload_52.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
- return ComposerAutoloaderInita087e57dec8ae31780dd0980fd5be965::getLoader();
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
+ return ComposerAutoloaderInita19e34f417e2b6f8a0edb8982a25f210::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit2c420f229f0b44a84053c7de0a411c61
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit2c420f229f0b44a84053c7de0a411c61
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit2c420f229f0b44a84053c7de0a411c61', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit2c420f229f0b44a84053c7de0a411c61', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
- call_user_func(\Composer\Autoload\ComposerStaticInit2c420f229f0b44a84053c7de0a411c61::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit2c420f229f0b44a84053c7de0a411c61
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit2c420f229f0b44a84053c7de0a411c61::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire2c420f229f0b44a84053c7de0a411c61($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire2c420f229f0b44a84053c7de0a411c61($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit982a28eab8420855eb099ba24fa8d700
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit982a28eab8420855eb099ba24fa8d700', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit982a28eab8420855eb099ba24fa8d700', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
+ call_user_func(\Composer\Autoload\ComposerStaticInit982a28eab8420855eb099ba24fa8d700::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
+ $includeFiles = Composer\Autoload\ComposerStaticInit982a28eab8420855eb099ba24fa8d700::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
+ composerRequire982a28eab8420855eb099ba24fa8d700($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
+ function composerRequire982a28eab8420855eb099ba24fa8d700($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
vendor/composer/autoload_real_52.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
- class ComposerAutoloaderInita087e57dec8ae31780dd0980fd5be965 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ class ComposerAutoloaderInita087e57dec8ae31780dd0980fd5be965 {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInita087e57dec8ae31780dd0980fd5be965', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInita087e57dec8ae31780dd0980fd5be965', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
+ class ComposerAutoloaderInita19e34f417e2b6f8a0edb8982a25f210 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInita19e34f417e2b6f8a0edb8982a25f210', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInita19e34f417e2b6f8a0edb8982a25f210', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit2c420f229f0b44a84053c7de0a411c61
8
  {
9
  public static $files = array (
10
  'fca581ae5268210490253d58378748c5' => __DIR__ . '/../..' . '/includes/functions.php',
@@ -102,8 +102,8 @@ class ComposerStaticInit2c420f229f0b44a84053c7de0a411c61
102
  public static function getInitializer(ClassLoader $loader)
103
  {
104
  return \Closure::bind(function () use ($loader) {
105
- $loader->prefixesPsr0 = ComposerStaticInit2c420f229f0b44a84053c7de0a411c61::$prefixesPsr0;
106
- $loader->classMap = ComposerStaticInit2c420f229f0b44a84053c7de0a411c61::$classMap;
107
 
108
  }, null, ClassLoader::class);
109
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit982a28eab8420855eb099ba24fa8d700
8
  {
9
  public static $files = array (
10
  'fca581ae5268210490253d58378748c5' => __DIR__ . '/../..' . '/includes/functions.php',
102
  public static function getInitializer(ClassLoader $loader)
103
  {
104
  return \Closure::bind(function () use ($loader) {
105
+ $loader->prefixesPsr0 = ComposerStaticInit982a28eab8420855eb099ba24fa8d700::$prefixesPsr0;
106
+ $loader->classMap = ComposerStaticInit982a28eab8420855eb099ba24fa8d700::$classMap;
107
 
108
  }, null, ClassLoader::class);
109
  }