Subscribe2 - Version 8.9.1

Version Description

Download this release

Release Info

Developer MattyRob
Plugin Icon 128x128 Subscribe2
Version 8.9.1
Comparing to
See all releases

Code changes from version 8.9 to 8.9.1

Files changed (5) hide show
  1. ChangeLog.txt +5 -0
  2. ReadMe.txt +1 -1
  3. classes/class-s2-core.php +7 -2
  4. classes/class-s2-upgrade.php +1 -1
  5. subscribe2.php +1 -1
ChangeLog.txt CHANGED
@@ -1,3 +1,8 @@
 
 
 
 
 
1
  = Version 8.9 by Matthew Robinson =
2
 
3
  * Fix fatal error in the uninstall.php file
1
+ = Version 8.9.1 by Matthew Robinson =
2
+
3
+ * Check for the existence of the mb_encode_mimeheader function before use as it's optional in PHP builds - thanks to derekmacewen
4
+ * Fix for fatal error in upgrade code due to calling the wrong class
5
+
6
  = Version 8.9 by Matthew Robinson =
7
 
8
  * Fix fatal error in the uninstall.php file
ReadMe.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_butt
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.1
6
  Tested up to: 3.5.1
7
- Stable tag: 8.9
8
  License: GPL3
9
 
10
  Sends a list of subscribers an email notification when new posts are published to your blog
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.1
6
  Tested up to: 3.5.1
7
+ Stable tag: 8.9.1
8
  License: GPL3
9
 
10
  Sends a list of subscribers an email notification when new posts are published to your blog
classes/class-s2-core.php CHANGED
@@ -351,8 +351,13 @@ class s2class {
351
  }
352
  }
353
 
354
- $header['From'] = mb_encode_mimeheader($this->myname, 'UTF-8', 'Q') . " <" . $this->myemail . ">";
355
- $header['Reply-To'] = mb_encode_mimeheader($this->myname, 'UTF-8', 'Q') . " <" . $this->myemail . ">";
 
 
 
 
 
356
  $header['Return-path'] = "<" . $this->myemail . ">";
357
  $header['Precedence'] = "list\nList-Id: " . html_entity_decode(get_option('blogname'), ENT_QUOTES) . "";
358
  if ( $type == 'html' ) {
351
  }
352
  }
353
 
354
+ if ( function_exists('mb_encode_mimeheader') ) {
355
+ $header['From'] = mb_encode_mimeheader($this->myname, 'UTF-8', 'Q') . " <" . $this->myemail . ">";
356
+ $header['Reply-To'] = mb_encode_mimeheader($this->myname, 'UTF-8', 'Q') . " <" . $this->myemail . ">";
357
+ } else {
358
+ $header['From'] = $this->myname. " <" . $this->myemail . ">";
359
+ $header['Reply-To'] = $this->myname . " <" . $this->myemail . ">";
360
+ }
361
  $header['Return-path'] = "<" . $this->myemail . ">";
362
  $header['Precedence'] = "list\nList-Id: " . html_entity_decode(get_option('blogname'), ENT_QUOTES) . "";
363
  if ( $type == 'html' ) {
classes/class-s2-upgrade.php CHANGED
@@ -289,7 +289,7 @@ class s2class_upgrade {
289
  // remove unnecessary table data
290
  $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 's2_cat'" );
291
 
292
- $sql = "SELECT ID FROM $wpdb->users INNER JOIN $wpdb->usermeta ON ( $wpdb->users.ID = $wpdb->usermeta.user_id) WHERE ( $wpdb->usermeta.meta_key = '" . $this->get_usermeta_keyname('s2_subscribed') . "' AND $wpdb->usermeta.meta_value LIKE ',%' )";
293
  $users = $wpdb->get_results($sql);
294
  foreach ( $users as $user ) {
295
  // make sure we remove leading ',' from this setting
289
  // remove unnecessary table data
290
  $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 's2_cat'" );
291
 
292
+ $sql = "SELECT ID FROM $wpdb->users INNER JOIN $wpdb->usermeta ON ( $wpdb->users.ID = $wpdb->usermeta.user_id) WHERE ( $wpdb->usermeta.meta_key = '" . $mysubscribe2->get_usermeta_keyname('s2_subscribed') . "' AND $wpdb->usermeta.meta_value LIKE ',%' )";
293
  $users = $wpdb->get_results($sql);
294
  foreach ( $users as $user ) {
295
  // make sure we remove leading ',' from this setting
subscribe2.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
- Version: 8.9
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 8.9.1
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3