WordPress Email Marketing Plugin – WP Email Capture - Version 3.3.1

Version Description

  • Fixes a conflict with other plugins that send HTML emails.
Download this release

Release Info

Developer rhyswynne
Plugin Icon 128x128 WordPress Email Marketing Plugin – WP Email Capture
Version 3.3.1
Comparing to
See all releases

Code changes from version 3.3 to 3.3.1

Files changed (4) hide show
  1. inc/functions.php +7 -3
  2. inc/process.php +3 -0
  3. readme.txt +9 -6
  4. wp-email-capture.php +2 -2
inc/functions.php CHANGED
@@ -209,12 +209,14 @@ function wp_email_capture_set_html_mail_content_type() {
209
  * Set the email type to text/plain
210
  *
211
  * Happens after sending an email.
 
 
212
  *
213
  * @return string "text/plain"
214
  */
215
  function wp_email_capture_set_plain_content_type() {
216
  return 'text/plain';
217
- } add_filter( 'wp_mail_content_type', 'wp_email_capture_set_plain_content_type' );
218
 
219
 
220
  /**
@@ -237,7 +239,9 @@ function wp_email_capture_set_email_to_html() {
237
  * @return void
238
  */
239
  function wp_email_capture_set_email_to_plain() {
240
- if ( 1 == get_option( 'wp_email_capture_send_email_html' ) ) {
241
- add_filter( 'wp_mail_content_type', 'wp_email_capture_set_plain_content_type' );
 
 
242
  }
243
  }
209
  * Set the email type to text/plain
210
  *
211
  * Happens after sending an email.
212
+ *
213
+ * - DEPRECATED 3.3 -
214
  *
215
  * @return string "text/plain"
216
  */
217
  function wp_email_capture_set_plain_content_type() {
218
  return 'text/plain';
219
+ }
220
 
221
 
222
  /**
239
  * @return void
240
  */
241
  function wp_email_capture_set_email_to_plain() {
242
+ if ( has_filter( 'wp_mail_content_type', 'wp_email_capture_set_html_mail_content_type' ) ) {
243
+ if ( 1 == get_option( 'wp_email_capture_send_email_html' ) ) {
244
+ remove_filter( 'wp_mail_content_type', 'wp_email_capture_set_html_mail_content_type' );
245
+ }
246
  }
247
  }
inc/process.php CHANGED
@@ -340,12 +340,15 @@ function wp_email_capture_send_email_default( $to, $subject, $message, $header )
340
 
341
  }
342
 
 
 
343
  if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
344
  require_once ABSPATH . WPINC . '/class-phpmailer.php';
345
  require_once ABSPATH . WPINC . '/class-smtp.php';
346
  $phpmailer = new PHPMailer( true );
347
  }
348
 
 
349
  // Set SMTPDebug to true
350
  /* $phpmailer->SMTPDebug = false;
351
 
340
 
341
  }
342
 
343
+ // CLEAN THIS UP
344
+ // @todo CLEAN UP
345
  if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
346
  require_once ABSPATH . WPINC . '/class-phpmailer.php';
347
  require_once ABSPATH . WPINC . '/class-smtp.php';
348
  $phpmailer = new PHPMailer( true );
349
  }
350
 
351
+ /* DEPRECATED 3.3 */
352
  // Set SMTPDebug to true
353
  /* $phpmailer->SMTPDebug = false;
354
 
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Tags: email, marketing, capture, form, affiliates, mailing lists, email marketing, widget ready
3
  Requires at least: 3.0
4
  Tested up to: 4.7
5
- Version: 3.3
6
- Stable tag: 3.3
7
  Contributors: rhyswynne
8
  Donate link: https://www.wpemailcapture.com/premium/?utm_source=donatelink&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture
9
 
@@ -70,11 +70,11 @@ If you want to insert the form within a page, insert into any post or page the s
70
 
71
  You can also add a widget to any widget enabled area by going to Appearance > Widgets in the WordPress Administration.
72
 
73
- If you need more help, please read this guide on [how to set up WP Email Capture](http://wpemailcapture.com/2012/10/how-to-set-up-wp-email-capture-free/?utm_source=installation&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
74
-
75
  == Bugs/Suggestions/Support ==
76
- Please report any bugs, support and suggestions to the [WP Email Capture Support Page](http://www.wpemailcapture.com/support/?utm_source=support&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
77
-
78
  == Donate ==
79
  To donate to this plugin, please visit the [WP Email Capture Donations Page](http://wpemailcapture.com/premium/?utm_source=donate&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
80
 
@@ -159,6 +159,9 @@ This plugin does use widgets, so probably yes :)
159
  Wherever you put in %NAME% (spelt exactly like that, uppercase as well), it will be replaced with the name given by the user.
160
 
161
  == Change Log ==
 
 
 
162
  = 3.3 =
163
  * Introduced the ability to have "HTML" enabled lists.
164
  * Introduced the ability to send emails without headers. Useful for Amazon SES.
2
  Tags: email, marketing, capture, form, affiliates, mailing lists, email marketing, widget ready
3
  Requires at least: 3.0
4
  Tested up to: 4.7
5
+ Version: 3.3.1
6
+ Stable tag: 3.3.1
7
  Contributors: rhyswynne
8
  Donate link: https://www.wpemailcapture.com/premium/?utm_source=donatelink&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture
9
 
70
 
71
  You can also add a widget to any widget enabled area by going to Appearance > Widgets in the WordPress Administration.
72
 
73
+ If you need more help, please read this guide on [how to set up WP Email Capture](http://wpemailcapture.com/2012/10/how-to-set-up-wp-email-capture-free/?utm_source=installation&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
74
+
75
  == Bugs/Suggestions/Support ==
76
+ Please report any bugs, support and suggestions to the [WP Email Capture Support Page](http://www.wpemailcapture.com/support/?utm_source=support&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
77
+
78
  == Donate ==
79
  To donate to this plugin, please visit the [WP Email Capture Donations Page](http://wpemailcapture.com/premium/?utm_source=donate&utm_medium=wordpressorgreadme&utm_campaign=wpemailcapture)
80
 
159
  Wherever you put in %NAME% (spelt exactly like that, uppercase as well), it will be replaced with the name given by the user.
160
 
161
  == Change Log ==
162
+ = 3.3.1 =
163
+ * Fixes a conflict with other plugins that send HTML emails.
164
+
165
  = 3.3 =
166
  * Introduced the ability to have "HTML" enabled lists.
167
  * Introduced the ability to send emails without headers. Useful for Amazon SES.
wp-email-capture.php CHANGED
@@ -8,7 +8,7 @@ Plugin URI: https://www.wpemailcapture.com/?utm_source=plugin-link&utm_medium=pl
8
 
9
  Description: Captures email addresses for insertion into software such as <a href="http://wpemailcapture.com/recommends/aweber" title="Email Marketing">Aweber</a> or <a href="http://wpemailcapture.com/recommends/mailchimp/">Mailchimp</a>
10
 
11
- Version: 3.3
12
 
13
  Author: Winwar Media
14
 
@@ -26,7 +26,7 @@ define( 'WP_EMAIL_CAPTURE_PATH', dirname( __FILE__ ) );
26
  define( 'WP_EMAIL_CAPTURE_URL', plugins_url( '', __FILE__ ) );
27
  define( 'WP_EMAIL_CAPTURE_TEMP_MEMBERS_TABLE', $wpdb->prefix . 'wp_email_capture_temp_members');
28
  define( 'WP_EMAIL_CAPTURE_REGISTERED_MEMBERS_TABLE', $wpdb->prefix . 'wp_email_capture_registered_members');
29
- define( 'WP_EMAIL_CAPTURE_VERSION', '3.3-beta' );
30
 
31
  require_once WP_EMAIL_CAPTURE_PATH . '/inc/core.php';
32
 
8
 
9
  Description: Captures email addresses for insertion into software such as <a href="http://wpemailcapture.com/recommends/aweber" title="Email Marketing">Aweber</a> or <a href="http://wpemailcapture.com/recommends/mailchimp/">Mailchimp</a>
10
 
11
+ Version: 3.3.1
12
 
13
  Author: Winwar Media
14
 
26
  define( 'WP_EMAIL_CAPTURE_URL', plugins_url( '', __FILE__ ) );
27
  define( 'WP_EMAIL_CAPTURE_TEMP_MEMBERS_TABLE', $wpdb->prefix . 'wp_email_capture_temp_members');
28
  define( 'WP_EMAIL_CAPTURE_REGISTERED_MEMBERS_TABLE', $wpdb->prefix . 'wp_email_capture_registered_members');
29
+ define( 'WP_EMAIL_CAPTURE_VERSION', '3.3.1' );
30
 
31
  require_once WP_EMAIL_CAPTURE_PATH . '/inc/core.php';
32