MailChimp for WordPress - Version 4.5.5

Version Description

Download this release

Release Info

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

Code changes from version 4.5.4 to 4.5.5

Files changed (8) hide show
  1. CHANGELOG.md +7 -0
  2. config/default-form-content.php +2 -2
  3. includes/forms/class-google-recaptcha.php +6 -1
  4. languages/mailchimp-for-wp.pot +6 -6
  5. mailchimp-for-wp.php +2 -2
  6. readme.txt +8 -1
  7. vendor/autoload_52.php +1 -1
  8. vendor/composer/autoload_real_52.php +3 -3
CHANGELOG.md CHANGED
@@ -1,6 +1,13 @@
1
  Changelog
2
  =========
3
 
 
 
 
 
 
 
 
4
  #### 4.5.4 - Sep 11, 2019
5
 
6
  **Improvements**
1
  Changelog
2
  =========
3
 
4
+ #### 4.5.5 - Sep 12, 2019
5
+
6
+ **Fixes**
7
+
8
+ - Google reCAPTCHA script was still loading even if no forms have it enabled.
9
+
10
+
11
  #### 4.5.4 - Sep 11, 2019
12
 
13
  **Improvements**
config/default-form-content.php CHANGED
@@ -4,8 +4,8 @@ $email_label = __('Email address', 'mailchimp-for-wp');
4
  $email_placeholder = __('Your email address', 'mailchimp-for-wp');
5
  $signup_button = __('Sign up', 'mailchimp-for-wp');
6
 
7
- $content = "<p>\n\t<label>{$email_label}: </label>\n";
8
- $content .= "\t<input type=\"email\" name=\"EMAIL\" placeholder=\"{$email_placeholder}\" required />\n</p>\n\n";
9
  $content .= "<p>\n\t<input type=\"submit\" value=\"{$signup_button}\" />\n</p>";
10
 
11
  return $content;
4
  $email_placeholder = __('Your email address', 'mailchimp-for-wp');
5
  $signup_button = __('Sign up', 'mailchimp-for-wp');
6
 
7
+ $content = "<p>\n\t<label>{$email_label}: \n";
8
+ $content .= "\t\t<input type=\"email\" name=\"EMAIL\" placeholder=\"{$email_placeholder}\" required />\n</label>\n</p>\n\n";
9
  $content .= "<p>\n\t<input type=\"submit\" value=\"{$signup_button}\" />\n</p>";
10
 
11
  return $content;
includes/forms/class-google-recaptcha.php CHANGED
@@ -11,7 +11,7 @@ class MC4WP_Google_Recaptcha {
11
  add_filter('mc4wp_form_errors', array($this, 'verify_token'), 10, 2);
12
  add_action('mc4wp_admin_form_after_behaviour_settings_rows', array($this, 'show_settings'), 30, 2);
13
  add_filter('mc4wp_form_sanitized_data', array($this, 'sanitize_settings'), 20, 2);
14
- add_action('wp_footer', array($this, 'load_script'), 800);
15
  }
16
 
17
 
@@ -49,6 +49,11 @@ class MC4WP_Google_Recaptcha {
49
  public function load_script() {
50
  $global_settings = mc4wp_get_settings();
51
 
 
 
 
 
 
52
  // load Google reCAPTCHA script
53
  echo sprintf('<script src="https://www.google.com/recaptcha/api.js?render=%s"></script>', esc_attr($global_settings['grecaptcha_site_key']));
54
 
11
  add_filter('mc4wp_form_errors', array($this, 'verify_token'), 10, 2);
12
  add_action('mc4wp_admin_form_after_behaviour_settings_rows', array($this, 'show_settings'), 30, 2);
13
  add_filter('mc4wp_form_sanitized_data', array($this, 'sanitize_settings'), 20, 2);
14
+ add_action('wp_footer', array($this, 'load_script'), 8000);
15
  }
16
 
17
 
49
  public function load_script() {
50
  $global_settings = mc4wp_get_settings();
51
 
52
+ // do not load if no forms with Google reCAPTCHA enabled were outputted
53
+ if (empty($this->form_ids) || empty($global_settings['grecaptcha_site_key']) || empty($global_settings['grecaptcha_secret_key'])) {
54
+ return;
55
+ }
56
+
57
  // load Google reCAPTCHA script
58
  echo sprintf('<script src="https://www.google.com/recaptcha/api.js?render=%s"></script>', esc_attr($global_settings['grecaptcha_site_key']));
59
 
languages/mailchimp-for-wp.pot CHANGED
@@ -413,27 +413,27 @@ msgstr ""
413
  msgid "There is no form with ID %d, perhaps it was deleted?"
414
  msgstr ""
415
 
416
- #: includes/forms/class-google-recaptcha.php:153
417
  msgid "Enable Google reCaptcha"
418
  msgstr ""
419
 
420
- #: includes/forms/class-google-recaptcha.php:159
421
  msgid "Select \"yes\" to enable Google reCAPTCHA spam protection for this form."
422
  msgstr ""
423
 
424
- #: includes/forms/class-google-recaptcha.php:165
425
  msgid "Google reCAPTCHA Site Key"
426
  msgstr ""
427
 
428
- #: includes/forms/class-google-recaptcha.php:169
429
  msgid "Enter your Google reCAPTCHA keys here. You can <a href=\"%s\">retrieve your keys in the Google reCAPTCHA admin console</a> or read our help article on <a href=\"%s\">how to configure Google reCAPTCHA</a>."
430
  msgstr ""
431
 
432
- #: includes/forms/class-google-recaptcha.php:175
433
  msgid "Google reCAPTCHA Secret Key"
434
  msgstr ""
435
 
436
- #: includes/forms/class-google-recaptcha.php:179
437
  msgstr ""
438
 
439
  #: includes/forms/class-widget.php:28
413
  msgid "There is no form with ID %d, perhaps it was deleted?"
414
  msgstr ""
415
 
416
+ #: includes/forms/class-google-recaptcha.php:158
417
  msgid "Enable Google reCaptcha"
418
  msgstr ""
419
 
420
+ #: includes/forms/class-google-recaptcha.php:164
421
  msgid "Select \"yes\" to enable Google reCAPTCHA spam protection for this form."
422
  msgstr ""
423
 
424
+ #: includes/forms/class-google-recaptcha.php:170
425
  msgid "Google reCAPTCHA Site Key"
426
  msgstr ""
427
 
428
+ #: includes/forms/class-google-recaptcha.php:174
429
  msgid "Enter your Google reCAPTCHA keys here. You can <a href=\"%s\">retrieve your keys in the Google reCAPTCHA admin console</a> or read our help article on <a href=\"%s\">how to configure Google reCAPTCHA</a>."
430
  msgstr ""
431
 
432
+ #: includes/forms/class-google-recaptcha.php:180
433
  msgid "Google reCAPTCHA Secret Key"
434
  msgstr ""
435
 
436
+ #: includes/forms/class-google-recaptcha.php:184
437
  msgstr ""
438
 
439
  #: includes/forms/class-widget.php:28
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.5.4
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.5.4');
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.5.5
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.5.5');
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.5.4
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.5.4 - Sep 11, 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.5.5
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.5.5 - Sep 12, 2019
201
+
202
+ **Fixes**
203
+
204
+ - Google reCAPTCHA script was still loading even if no forms have it enabled.
205
+
206
+
207
  #### 4.5.4 - Sep 11, 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 ComposerAutoloaderInit680ab6155c5792526b622800fdb8e9a8::getLoader();
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
+ return ComposerAutoloaderInit4ba1a30a16aefd207a865f0b7717e261::getLoader();
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 ComposerAutoloaderInit680ab6155c5792526b622800fdb8e9a8 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit680ab6155c5792526b622800fdb8e9a8 {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit680ab6155c5792526b622800fdb8e9a8', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit680ab6155c5792526b622800fdb8e9a8', '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 ComposerAutoloaderInit4ba1a30a16aefd207a865f0b7717e261 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit4ba1a30a16aefd207a865f0b7717e261', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit4ba1a30a16aefd207a865f0b7717e261', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);