Subscribe2 - Version 9.4

Version Description

Download this release

Release Info

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

Code changes from version 9.3 to 9.4

Files changed (6) hide show
  1. ChangeLog.txt +6 -0
  2. ReadMe.txt +1 -1
  3. subscribe2.pot → Subscribe2.pot +29 -29
  4. admin/subscribers.php +23 -7
  5. classes/class-s2-core.php +8 -3
  6. subscribe2.php +2 -2
ChangeLog.txt CHANGED
@@ -1,3 +1,9 @@
 
 
 
 
 
 
1
  = Version 9.3 by Matthew Robinson =
2
 
3
  * Only add 'weekly' cron schedule interval if it does not already exist
1
+ = Version 9.4 by Matthew Robinson =
2
+
3
+ * Fix for non-existing variable errors on Subscribe2->Subscribers page - thanks to bapakrob and perezlr
4
+ * Don’t display Excluded Categories in Bulk Management is Registered users cannot override the exclusion
5
+ * Fix for disappearing Jetpack Stats module - thanks to desertravenart
6
+
7
  = Version 9.3 by Matthew Robinson =
8
 
9
  * Only add 'weekly' cron schedule interval if it does not already exist
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.3
6
  Tested up to: 3.9
7
- Stable tag: 9.3
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.3
6
  Tested up to: 3.9
7
+ Stable tag: 9.4
8
  License: GPL3
9
 
10
  Sends a list of subscribers an email notification when new posts are published to your blog
subscribe2.pot → Subscribe2.pot RENAMED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the Subscribe2 package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Subscribe2 9.3\n"
6
- "Report-Msgid-Bugs-To: http://wordpress.org/tag/Subscribe2\n"
7
- "POT-Creation-Date: 2014-04-16 20:46:57+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -170,7 +170,7 @@ msgstr ""
170
  #: admin/settings.php:205 admin/settings.php:211 admin/settings.php:225
171
  #: admin/settings.php:230 admin/settings.php:235 admin/settings.php:356
172
  #: admin/settings.php:361 admin/settings.php:375 admin/settings.php:382
173
- #: admin/settings.php:396 admin/settings.php:402 admin/subscribers.php:281
174
  #: admin/your_subscriptions.php:123 admin/your_subscriptions.php:164
175
  msgid "Yes"
176
  msgstr ""
@@ -179,7 +179,7 @@ msgstr ""
179
  #: admin/settings.php:232 admin/settings.php:237 admin/settings.php:353
180
  #: admin/settings.php:358 admin/settings.php:363 admin/settings.php:377
181
  #: admin/settings.php:384 admin/settings.php:393 admin/settings.php:398
182
- #: admin/settings.php:404 admin/subscribers.php:283
183
  #: admin/your_subscriptions.php:125 admin/your_subscriptions.php:168
184
  msgid "No"
185
  msgstr ""
@@ -412,22 +412,22 @@ msgstr ""
412
  msgid "Auto-subscribe users to receive email as"
413
  msgstr ""
414
 
415
- #: admin/settings.php:366 admin/subscribers.php:271
416
  #: admin/your_subscriptions.php:112
417
  msgid "HTML - Full"
418
  msgstr ""
419
 
420
- #: admin/settings.php:368 admin/subscribers.php:272
421
  #: admin/your_subscriptions.php:114
422
  msgid "HTML - Excerpt"
423
  msgstr ""
424
 
425
- #: admin/settings.php:370 admin/subscribers.php:273
426
  #: admin/your_subscriptions.php:116
427
  msgid "Plain Text - Full"
428
  msgstr ""
429
 
430
- #: admin/settings.php:372 admin/subscribers.php:274
431
  #: admin/your_subscriptions.php:118
432
  msgid "Plain Text - Excerpt"
433
  msgstr ""
@@ -631,12 +631,12 @@ msgstr ""
631
  msgid "Enter addresses, one per line or comma-separated"
632
  msgstr ""
633
 
634
- #: admin/subscribers.php:202 admin/subscribers.php:266
635
  #: admin/your_subscriptions.php:263 classes/class-s2-frontend.php:67
636
  msgid "Subscribe"
637
  msgstr ""
638
 
639
- #: admin/subscribers.php:203 admin/subscribers.php:267
640
  #: admin/your_subscriptions.php:242 classes/class-s2-frontend.php:66
641
  msgid "Unsubscribe"
642
  msgstr ""
@@ -669,41 +669,41 @@ msgstr ""
669
  msgid "Bulk Management"
670
  msgstr ""
671
 
672
- #: admin/subscribers.php:263 admin/subscribers.php:277
673
  msgid ""
674
  "Preferences for Registered Users selected in the filter above can be changed "
675
  "using this section."
676
  msgstr ""
677
 
678
- #: admin/subscribers.php:264 admin/subscribers.php:278
679
  msgid "Consider User Privacy as changes cannot be undone"
680
  msgstr ""
681
 
682
- #: admin/subscribers.php:265
683
  msgid "Action to perform"
684
  msgstr ""
685
 
686
- #: admin/subscribers.php:269
687
  msgid "Bulk Update Categories"
688
  msgstr ""
689
 
690
- #: admin/subscribers.php:270
691
  msgid "Send email as"
692
  msgstr ""
693
 
694
- #: admin/subscribers.php:275
695
  msgid "Bulk Update Format"
696
  msgstr ""
697
 
698
- #: admin/subscribers.php:279
699
  msgid "Subscribe Selected Users to receive a periodic digest notification"
700
  msgstr ""
701
 
702
- #: admin/subscribers.php:284
703
  msgid "Bulk Update Digest Subscription"
704
  msgstr ""
705
 
706
- #: admin/subscribers.php:298
707
  msgid "You are about to delete user account(s). Are you sure?"
708
  msgstr ""
709
 
@@ -783,7 +783,7 @@ msgstr ""
783
  msgid "Subscribe to new blogs"
784
  msgstr ""
785
 
786
- #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.3) #-#-#-#-#
787
  #. Plugin Name of the plugin/theme
788
  #: classes/class-s2-admin.php:8 include/widget.php:17
789
  msgid "Subscribe2"
@@ -1131,27 +1131,27 @@ msgstr ""
1131
  msgid "Weekly"
1132
  msgstr ""
1133
 
1134
- #: classes/class-s2-core.php:1444 classes/class-s2-core.php:1445
1135
  msgid "Author"
1136
  msgstr ""
1137
 
1138
- #: classes/class-s2-core.php:1451
1139
  msgid "Posted on"
1140
  msgstr ""
1141
 
1142
- #: classes/class-s2-core.php:1469 classes/class-s2-core.php:1470
1143
  msgid "Posted in"
1144
  msgstr ""
1145
 
1146
- #: classes/class-s2-core.php:1475 classes/class-s2-core.php:1476
1147
  msgid "Tagged as"
1148
  msgstr ""
1149
 
1150
- #: classes/class-s2-core.php:1548
1151
  msgid "Digest Email"
1152
  msgstr ""
1153
 
1154
- #: classes/class-s2-core.php:1558
1155
  msgid "Digest Preview"
1156
  msgstr ""
1157
 
@@ -1497,9 +1497,9 @@ msgid ""
1497
  "a site level"
1498
  msgstr ""
1499
 
1500
- #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.3) #-#-#-#-#
1501
  #. Plugin URI of the plugin/theme
1502
- #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.3) #-#-#-#-#
1503
  #. Author URI of the plugin/theme
1504
  msgid "http://subscribe2.wordpress.com"
1505
  msgstr ""
2
  # This file is distributed under the same license as the Subscribe2 package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Subscribe2 9.4\n"
6
+ "Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/Subscribe2\n"
7
+ "POT-Creation-Date: 2014-04-21 20:27:19+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
170
  #: admin/settings.php:205 admin/settings.php:211 admin/settings.php:225
171
  #: admin/settings.php:230 admin/settings.php:235 admin/settings.php:356
172
  #: admin/settings.php:361 admin/settings.php:375 admin/settings.php:382
173
+ #: admin/settings.php:396 admin/settings.php:402 admin/subscribers.php:297
174
  #: admin/your_subscriptions.php:123 admin/your_subscriptions.php:164
175
  msgid "Yes"
176
  msgstr ""
179
  #: admin/settings.php:232 admin/settings.php:237 admin/settings.php:353
180
  #: admin/settings.php:358 admin/settings.php:363 admin/settings.php:377
181
  #: admin/settings.php:384 admin/settings.php:393 admin/settings.php:398
182
+ #: admin/settings.php:404 admin/subscribers.php:299
183
  #: admin/your_subscriptions.php:125 admin/your_subscriptions.php:168
184
  msgid "No"
185
  msgstr ""
412
  msgid "Auto-subscribe users to receive email as"
413
  msgstr ""
414
 
415
+ #: admin/settings.php:366 admin/subscribers.php:283
416
  #: admin/your_subscriptions.php:112
417
  msgid "HTML - Full"
418
  msgstr ""
419
 
420
+ #: admin/settings.php:368 admin/subscribers.php:284
421
  #: admin/your_subscriptions.php:114
422
  msgid "HTML - Excerpt"
423
  msgstr ""
424
 
425
+ #: admin/settings.php:370 admin/subscribers.php:285
426
  #: admin/your_subscriptions.php:116
427
  msgid "Plain Text - Full"
428
  msgstr ""
429
 
430
+ #: admin/settings.php:372 admin/subscribers.php:286
431
  #: admin/your_subscriptions.php:118
432
  msgid "Plain Text - Excerpt"
433
  msgstr ""
631
  msgid "Enter addresses, one per line or comma-separated"
632
  msgstr ""
633
 
634
+ #: admin/subscribers.php:202 admin/subscribers.php:274
635
  #: admin/your_subscriptions.php:263 classes/class-s2-frontend.php:67
636
  msgid "Subscribe"
637
  msgstr ""
638
 
639
+ #: admin/subscribers.php:203 admin/subscribers.php:275
640
  #: admin/your_subscriptions.php:242 classes/class-s2-frontend.php:66
641
  msgid "Unsubscribe"
642
  msgstr ""
669
  msgid "Bulk Management"
670
  msgstr ""
671
 
672
+ #: admin/subscribers.php:271 admin/subscribers.php:293
673
  msgid ""
674
  "Preferences for Registered Users selected in the filter above can be changed "
675
  "using this section."
676
  msgstr ""
677
 
678
+ #: admin/subscribers.php:272 admin/subscribers.php:294
679
  msgid "Consider User Privacy as changes cannot be undone"
680
  msgstr ""
681
 
682
+ #: admin/subscribers.php:273
683
  msgid "Action to perform"
684
  msgstr ""
685
 
686
+ #: admin/subscribers.php:281
687
  msgid "Bulk Update Categories"
688
  msgstr ""
689
 
690
+ #: admin/subscribers.php:282
691
  msgid "Send email as"
692
  msgstr ""
693
 
694
+ #: admin/subscribers.php:287
695
  msgid "Bulk Update Format"
696
  msgstr ""
697
 
698
+ #: admin/subscribers.php:295
699
  msgid "Subscribe Selected Users to receive a periodic digest notification"
700
  msgstr ""
701
 
702
+ #: admin/subscribers.php:300
703
  msgid "Bulk Update Digest Subscription"
704
  msgstr ""
705
 
706
+ #: admin/subscribers.php:314
707
  msgid "You are about to delete user account(s). Are you sure?"
708
  msgstr ""
709
 
783
  msgid "Subscribe to new blogs"
784
  msgstr ""
785
 
786
+ #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.4) #-#-#-#-#
787
  #. Plugin Name of the plugin/theme
788
  #: classes/class-s2-admin.php:8 include/widget.php:17
789
  msgid "Subscribe2"
1131
  msgid "Weekly"
1132
  msgstr ""
1133
 
1134
+ #: classes/class-s2-core.php:1449 classes/class-s2-core.php:1450
1135
  msgid "Author"
1136
  msgstr ""
1137
 
1138
+ #: classes/class-s2-core.php:1456
1139
  msgid "Posted on"
1140
  msgstr ""
1141
 
1142
+ #: classes/class-s2-core.php:1474 classes/class-s2-core.php:1475
1143
  msgid "Posted in"
1144
  msgstr ""
1145
 
1146
+ #: classes/class-s2-core.php:1480 classes/class-s2-core.php:1481
1147
  msgid "Tagged as"
1148
  msgstr ""
1149
 
1150
+ #: classes/class-s2-core.php:1553
1151
  msgid "Digest Email"
1152
  msgstr ""
1153
 
1154
+ #: classes/class-s2-core.php:1563
1155
  msgid "Digest Preview"
1156
  msgstr ""
1157
 
1497
  "a site level"
1498
  msgstr ""
1499
 
1500
+ #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.4) #-#-#-#-#
1501
  #. Plugin URI of the plugin/theme
1502
+ #. #-#-#-#-# Subscribe2.pot (Subscribe2 9.4) #-#-#-#-#
1503
  #. Author URI of the plugin/theme
1504
  msgid "http://subscribe2.wordpress.com"
1505
  msgstr ""
admin/subscribers.php CHANGED
@@ -260,26 +260,42 @@ if ( $current_tab === 'registered' ) {
260
  echo "<div class=\"s2_admin\" id=\"s2_bulk_manage\">\r\n";
261
  echo "<h2>" . __('Bulk Management', 'subscribe2') . "</h2>\r\n";
262
  if ( $this->subscribe2_options['email_freq'] == 'never' ) {
 
 
 
 
 
 
 
 
263
  echo __('Preferences for Registered Users selected in the filter above can be changed using this section.', 'subscribe2') . "<br />\r\n";
264
  echo "<strong><em style=\"color: red\">" . __('Consider User Privacy as changes cannot be undone', 'subscribe2') . "</em></strong><br />\r\n";
265
  echo "<br />" . __('Action to perform', 'subscribe2') . ":\r\n";
266
  echo "<label><input type=\"radio\" name=\"manage\" value=\"subscribe\" checked=\"checked\" /> " . __('Subscribe', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
267
  echo "<label><input type=\"radio\" name=\"manage\" value=\"unsubscribe\" /> " . __('Unsubscribe', 'subscribe2') . "</label><br /><br />\r\n";
268
- $this->display_category_form($_POST['category']);
 
 
 
 
269
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_categories\" value=\"" . __('Bulk Update Categories', 'subscribe2') . "\" /></p>";
270
  echo "<br />" . __('Send email as', 'subscribe2') . ":\r\n";
271
- echo "<label><input type=\"radio\" name=\"format\" value=\"html\"" . checked($_POST['format'], 'html', false) . " /> " . __('HTML - Full', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
272
- echo "<label><input type=\"radio\" name=\"format\" value=\"html_excerpt\"" . checked($_POST['format'], 'html_excerpt', false) . " /> " . __('HTML - Excerpt', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
273
- echo "<label><input type=\"radio\" name=\"format\" value=\"post\"" . checked($_POST['format'], 'post', false) . " /> " . __('Plain Text - Full', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
274
- echo "<label><input type=\"radio\" name=\"format\" value=\"excerpt\"" . checked($_POST['format'], 'excerpt', false) . "/> " . __('Plain Text - Excerpt', 'subscribe2') . "</label>\r\n";
275
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_format\" value=\"" . __('Bulk Update Format', 'subscribe2') . "\" /></p>";
276
  } else {
 
 
 
 
277
  echo __('Preferences for Registered Users selected in the filter above can be changed using this section.', 'subscribe2') . "<br />\r\n";
278
  echo "<strong><em style=\"color: red\">" . __('Consider User Privacy as changes cannot be undone', 'subscribe2') . "</em></strong><br />\r\n";
279
  echo "<br />" . __('Subscribe Selected Users to receive a periodic digest notification', 'subscribe2') . ":\r\n";
280
- echo "<label><input type=\"radio\" name=\"sub_category\" value=\"digest\"" . checked($_POST['sub_category'], 'digest', false) . " /> ";
281
  echo __('Yes', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
282
- echo "<label><input type=\"radio\" name=\"sub_category\" value=\"-1\"" . checked($_POST['sub_category'], '-1', false) . " /> ";
283
  echo __('No', 'subscribe2') . "</label>";
284
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_digest\" value=\"" . __('Bulk Update Digest Subscription', 'subscribe2') . "\" /></p>";
285
  }
260
  echo "<div class=\"s2_admin\" id=\"s2_bulk_manage\">\r\n";
261
  echo "<h2>" . __('Bulk Management', 'subscribe2') . "</h2>\r\n";
262
  if ( $this->subscribe2_options['email_freq'] == 'never' ) {
263
+ $categories = array();
264
+ if ( isset($_POST['category']) ) {
265
+ $categories = $_POST['category'];
266
+ }
267
+ $format = '';
268
+ if ( isset($_POST['format']) ) {
269
+ $format = $_POST['format'];
270
+ }
271
  echo __('Preferences for Registered Users selected in the filter above can be changed using this section.', 'subscribe2') . "<br />\r\n";
272
  echo "<strong><em style=\"color: red\">" . __('Consider User Privacy as changes cannot be undone', 'subscribe2') . "</em></strong><br />\r\n";
273
  echo "<br />" . __('Action to perform', 'subscribe2') . ":\r\n";
274
  echo "<label><input type=\"radio\" name=\"manage\" value=\"subscribe\" checked=\"checked\" /> " . __('Subscribe', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
275
  echo "<label><input type=\"radio\" name=\"manage\" value=\"unsubscribe\" /> " . __('Unsubscribe', 'subscribe2') . "</label><br /><br />\r\n";
276
+ if ( '1' === $this->subscribe2_options['reg_override'] ) {
277
+ $this->display_category_form($categories, 1);
278
+ } else {
279
+ $this->display_category_form($categories, 0);
280
+ }
281
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_categories\" value=\"" . __('Bulk Update Categories', 'subscribe2') . "\" /></p>";
282
  echo "<br />" . __('Send email as', 'subscribe2') . ":\r\n";
283
+ echo "<label><input type=\"radio\" name=\"format\" value=\"html\"" . checked($format, 'html', false) . " /> " . __('HTML - Full', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
284
+ echo "<label><input type=\"radio\" name=\"format\" value=\"html_excerpt\"" . checked($format, 'html_excerpt', false) . " /> " . __('HTML - Excerpt', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
285
+ echo "<label><input type=\"radio\" name=\"format\" value=\"post\"" . checked($format, 'post', false) . " /> " . __('Plain Text - Full', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
286
+ echo "<label><input type=\"radio\" name=\"format\" value=\"excerpt\"" . checked($format, 'excerpt', false) . "/> " . __('Plain Text - Excerpt', 'subscribe2') . "</label>\r\n";
287
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_format\" value=\"" . __('Bulk Update Format', 'subscribe2') . "\" /></p>";
288
  } else {
289
+ $sub_cats = '';
290
+ if ( isset($_POST['sub_category']) ) {
291
+ $sub_cats = $_POST['sub_category'];
292
+ }
293
  echo __('Preferences for Registered Users selected in the filter above can be changed using this section.', 'subscribe2') . "<br />\r\n";
294
  echo "<strong><em style=\"color: red\">" . __('Consider User Privacy as changes cannot be undone', 'subscribe2') . "</em></strong><br />\r\n";
295
  echo "<br />" . __('Subscribe Selected Users to receive a periodic digest notification', 'subscribe2') . ":\r\n";
296
+ echo "<label><input type=\"radio\" name=\"sub_category\" value=\"digest\"" . checked($sub_cats, 'digest', false) . " /> ";
297
  echo __('Yes', 'subscribe2') . "</label>&nbsp;&nbsp;\r\n";
298
+ echo "<label><input type=\"radio\" name=\"sub_category\" value=\"-1\"" . checked($sub_cats, '-1', false) . " /> ";
299
  echo __('No', 'subscribe2') . "</label>";
300
  echo "<p class=\"submit\"><input type=\"submit\" class=\"button-primary\" name=\"sub_digest\" value=\"" . __('Bulk Update Digest Subscription', 'subscribe2') . "\" /></p>";
301
  }
classes/class-s2-core.php CHANGED
@@ -1340,7 +1340,11 @@ class s2class {
1340
  }
1341
  $s2_post_types = apply_filters('s2_post_types', $s2_post_types);
1342
  foreach ( $s2_post_types as $post_type ) {
1343
- ('' == $type) ? $type = $wpdb->prepare("%s", $post_type) : $type .= $wpdb->prepare(", %s", $post_type);
 
 
 
 
1344
  }
1345
 
1346
  // collect posts
@@ -1383,6 +1387,7 @@ class s2class {
1383
  $tablelinks = '';
1384
  $message_post= '';
1385
  $message_posttime = '';
 
1386
  $s2_taxonomies = apply_filters('s2_taxonomies', array('category'));
1387
  foreach ( $posts as $post ) {
1388
  // keep an array of post ids and skip if we've already done it once
@@ -1586,7 +1591,7 @@ class s2class {
1586
  Jetpack comments doesn't play nice, this function kills that module
1587
  */
1588
  function s2_hide_jetpack_comments($modules) {
1589
- unset( $modules['stats'] );
1590
  return $modules;
1591
  } // end s2_kill_jetpack_comments()
1592
 
@@ -1662,7 +1667,7 @@ class s2class {
1662
  }
1663
  }
1664
  // add actions for comment subscribers
1665
- if ( 'no' != $this->subscribe2_options['comment_subs'] ) {
1666
  add_filter('jetpack_get_available_modules', array(&$this, 's2_hide_jetpack_comments'));
1667
  if ( 'before' == $this->subscribe2_options['comment_subs'] ) {
1668
  add_action('comment_form_after_fields', array(&$this, 's2_comment_meta_form'));
1340
  }
1341
  $s2_post_types = apply_filters('s2_post_types', $s2_post_types);
1342
  foreach ( $s2_post_types as $post_type ) {
1343
+ if ( !isset($type) ) {
1344
+ $type = $wpdb->prepare("%s", $post_type);
1345
+ } else {
1346
+ $type .= $wpdb->prepare(", %s", $post_type);
1347
+ }
1348
  }
1349
 
1350
  // collect posts
1387
  $tablelinks = '';
1388
  $message_post= '';
1389
  $message_posttime = '';
1390
+ $digest_post_ids = array();
1391
  $s2_taxonomies = apply_filters('s2_taxonomies', array('category'));
1392
  foreach ( $posts as $post ) {
1393
  // keep an array of post ids and skip if we've already done it once
1591
  Jetpack comments doesn't play nice, this function kills that module
1592
  */
1593
  function s2_hide_jetpack_comments($modules) {
1594
+ unset($modules['comments']);
1595
  return $modules;
1596
  } // end s2_kill_jetpack_comments()
1597
 
1667
  }
1668
  }
1669
  // add actions for comment subscribers
1670
+ if ( 'no' !== $this->subscribe2_options['comment_subs'] ) {
1671
  add_filter('jetpack_get_available_modules', array(&$this, 's2_hide_jetpack_comments'));
1672
  if ( 'before' == $this->subscribe2_options['comment_subs'] ) {
1673
  add_action('comment_form_after_fields', array(&$this, 's2_comment_meta_form'));
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: 9.3
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3
@@ -55,7 +55,7 @@ if ( is_plugin_active_for_network(plugin_basename(__FILE__)) ) {
55
 
56
  // our version number. Don't touch this or any line below
57
  // unless you know exactly what you are doing
58
- define( 'S2VERSION', '9.3' );
59
  define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
60
  define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
61
  define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 9.4
7
  Author: Matthew Robinson
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3
55
 
56
  // our version number. Don't touch this or any line below
57
  // unless you know exactly what you are doing
58
+ define( 'S2VERSION', '9.4' );
59
  define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
60
  define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
61
  define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );