Subscribe2 - Version 10.22.1

Version Description

Download this release

Release Info

Developer tanaylakhani
Plugin Icon 128x128 Subscribe2
Version 10.22.1
Comparing to
See all releases

Code changes from version 10.22 to 10.22.1

Files changed (5) hide show
  1. ChangeLog.txt +10 -6
  2. ReadMe.txt +1 -1
  3. classes/class-s2-admin.php +1 -1
  4. classes/class-s2-core.php +6 -6
  5. subscribe2.php +2 -2
ChangeLog.txt CHANGED
@@ -1,6 +1,10 @@
 
 
 
 
1
  = 10.22 =
2
 
3
- * New release with lots of code improvements, bug fixes and enhancements - Thanks to Bryan Hadaway (bhadaway)!
4
 
5
  = 10.21 =
6
 
@@ -194,7 +198,7 @@
194
  * Fixes for database connectivity in the upgrade class file - thanks to rushu25
195
  * Fix for bug when antispam measures are disabled - thanks to serinx
196
  * Add option to Sidebar Widget to not wrap the button below the form
197
- * Straightened quotes in the ChangeLog
198
  * Remove all uses of PHP extract() function as per core ticket (https://core.trac.wordpress.org/ticket/22400)
199
 
200
  = Version 9.4 by Matthew Robinson =
@@ -382,7 +386,7 @@
382
  * Rename js files consistently with core ticket 21633
383
  * Add width parameter to comment form text to fix issues with some themes - proposed by mharpen
384
  * Added option to include Sticky Posts at the top of all Digest Notifications - proposed by pkhatmedia
385
- * Fixed some Markdown errors in the ReadMe
386
 
387
  = Version 8.4 by Matthew Robinson =
388
 
@@ -527,7 +531,7 @@
527
  = Version 6.2 by Matthew Robinson =
528
 
529
  * Pass email address to add() function explicitly
530
- * Fix typos in the ReadMe
531
  * Added warning on the Options page to avoid using the Subscribe2 KEYWORDS in posts as they will get substituted
532
  * Added HTML LABEL tags to the Subscribe2 form to support WCAG
533
  * SSL friendly with WordPress admin areas
@@ -633,7 +637,7 @@
633
  * Fixed a bug in TinyURL encoding introduced when links were click enabled
634
  * Removed BurnURL from the plugin as it appears to be no longer operational
635
  * Added urlencode to email addresses in Tools->Subscribers when editing other user preferences
636
- * Restored several FAQs to the ReadMe file and the [WordPress.org FAQ section](http://wordpress.org/extend/plugins/subscribe2/faq/)
637
 
638
  = Version 5.1 by Matthew Robinson =
639
 
@@ -675,7 +679,7 @@
675
  * Improved Bulk Subscribe and Unsubscribe routines to avoid database artefacts
676
  * Moved Select/Deselect All check box to the top of the category list in admin pages
677
  * Fixed small layout glitch in Manage->Subscribers screen
678
- * Added ChangeLog section to ReadMe to support WordPress.org/extend development
679
 
680
  = Version 4.17 by Matthew Robinson =
681
 
1
+ = 10.22.1 =
2
+
3
+ * Minor release with some bug fixes that really needed fixing - thanks to @doyousoft and @tastymouse
4
+
5
  = 10.22 =
6
 
7
+ * New release with lots of code improvements, bug fixes and enhancements - thanks to Bryan Hadaway (bhadaway)
8
 
9
  = 10.21 =
10
 
198
  * Fixes for database connectivity in the upgrade class file - thanks to rushu25
199
  * Fix for bug when antispam measures are disabled - thanks to serinx
200
  * Add option to Sidebar Widget to not wrap the button below the form
201
+ * Straightened quotes in the changelog
202
  * Remove all uses of PHP extract() function as per core ticket (https://core.trac.wordpress.org/ticket/22400)
203
 
204
  = Version 9.4 by Matthew Robinson =
386
  * Rename js files consistently with core ticket 21633
387
  * Add width parameter to comment form text to fix issues with some themes - proposed by mharpen
388
  * Added option to include Sticky Posts at the top of all Digest Notifications - proposed by pkhatmedia
389
+ * Fixed some Markdown errors in the readme
390
 
391
  = Version 8.4 by Matthew Robinson =
392
 
531
  = Version 6.2 by Matthew Robinson =
532
 
533
  * Pass email address to add() function explicitly
534
+ * Fix typos in the readme
535
  * Added warning on the Options page to avoid using the Subscribe2 KEYWORDS in posts as they will get substituted
536
  * Added HTML LABEL tags to the Subscribe2 form to support WCAG
537
  * SSL friendly with WordPress admin areas
637
  * Fixed a bug in TinyURL encoding introduced when links were click enabled
638
  * Removed BurnURL from the plugin as it appears to be no longer operational
639
  * Added urlencode to email addresses in Tools->Subscribers when editing other user preferences
640
+ * Restored several FAQs to the readme file and the [WordPress.org FAQ section](http://wordpress.org/extend/plugins/subscribe2/faq/)
641
 
642
  = Version 5.1 by Matthew Robinson =
643
 
679
  * Improved Bulk Subscribe and Unsubscribe routines to avoid database artefacts
680
  * Moved Select/Deselect All check box to the top of the category list in admin pages
681
  * Fixed small layout glitch in Manage->Subscribers screen
682
+ * Added changelog section to readme to support WordPress.org/extend development
683
 
684
  = Version 4.17 by Matthew Robinson =
685
 
ReadMe.txt CHANGED
@@ -4,7 +4,7 @@ Contributors: Dabelon, wenzhixue, tanaylakhani
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.3
6
  Tested up to: 4.8.1
7
- Stable tag: 10.22
8
  License: GPLv3
9
 
10
  Sends a list of subscribers an email notification when you publish new posts.
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.3
6
  Tested up to: 4.8.1
7
+ Stable tag: 10.22.1
8
  License: GPLv3
9
 
10
  Sends a list of subscribers an email notification when you publish new posts.
classes/class-s2-admin.php CHANGED
@@ -288,7 +288,7 @@ class S2_Admin extends S2_Core {
288
  }
289
  $s2_post_types = apply_filters( 's2_post_types', $s2_post_types );
290
  foreach ( $s2_post_types as $s2_post_type ) {
291
- add_meta_box( 'subscribe2', __( 'Subscribe2 Notification Override', 'subscribe2' ), array( &$this, 's2-meta-box' ), $s2_post_type, 'advanced' );
292
  }
293
  } // end s2_meta_init()
294
 
288
  }
289
  $s2_post_types = apply_filters( 's2_post_types', $s2_post_types );
290
  foreach ( $s2_post_types as $s2_post_type ) {
291
+ add_meta_box( 'subscribe2', __( 'Subscribe2 Notification Override', 'subscribe2' ), array( &$this, 's2_override_meta' ), $s2_post_type, 'advanced' );
292
  }
293
  } // end s2_meta_init()
294
 
classes/class-s2-core.php CHANGED
@@ -580,9 +580,9 @@ class S2_Core {
580
  /**
581
  Send confirmation email to a public subscriber
582
  */
583
- function send_confirm( $what = '', $is_remind = false ) {
584
  if ( 1 === $this->filtered ) { return true; }
585
- if ( ! $this->email || ! $what ) { return false; }
586
  $id = $this->get_id( $this->email );
587
  if ( ! $id ) {
588
  return false;
@@ -597,7 +597,7 @@ class S2_Core {
597
 
598
  if ( 'add' === $action ) {
599
  $link .= '1';
600
- } elseif ( 'del' === $action && true === $public ) {
601
  $link .= '0';
602
  }
603
  $link .= wp_hash( $this->email );
@@ -610,12 +610,12 @@ class S2_Core {
610
  $body = $this->substitute( stripslashes( $this->subscribe2_options['remind_email'] ) );
611
  $subject = $this->substitute( stripslashes( $this->subscribe2_options['remind_subject'] ) );
612
  } else {
613
- $body = apply_filters( 's2_confirm_email', stripslashes( $this->subscribe2_options['confirm_email'] ), $what );
614
  $body = $this->substitute( $body );
615
- if ( 'add' === $what ) {
616
  $body = str_replace( '{ACTION}', $this->subscribe, $body );
617
  $subject = str_replace( '{ACTION}', $this->subscribe, $this->subscribe2_options['confirm_subject'] );
618
- } elseif ( 'del' === $what ) {
619
  $body = str_replace( '{ACTION}', $this->unsubscribe, $body );
620
  $subject = str_replace( '{ACTION}', $this->unsubscribe, $this->subscribe2_options['confirm_subject'] );
621
  }
580
  /**
581
  Send confirmation email to a public subscriber
582
  */
583
+ function send_confirm( $action = '', $is_remind = false ) {
584
  if ( 1 === $this->filtered ) { return true; }
585
+ if ( ! $this->email || empty( $action ) ) { return false; }
586
  $id = $this->get_id( $this->email );
587
  if ( ! $id ) {
588
  return false;
597
 
598
  if ( 'add' === $action ) {
599
  $link .= '1';
600
+ } elseif ( 'del' === $action ) {
601
  $link .= '0';
602
  }
603
  $link .= wp_hash( $this->email );
610
  $body = $this->substitute( stripslashes( $this->subscribe2_options['remind_email'] ) );
611
  $subject = $this->substitute( stripslashes( $this->subscribe2_options['remind_subject'] ) );
612
  } else {
613
+ $body = apply_filters( 's2_confirm_email', stripslashes( $this->subscribe2_options['confirm_email'] ), $action );
614
  $body = $this->substitute( $body );
615
+ if ( 'add' === $action ) {
616
  $body = str_replace( '{ACTION}', $this->subscribe, $body );
617
  $subject = str_replace( '{ACTION}', $this->subscribe, $this->subscribe2_options['confirm_subject'] );
618
+ } elseif ( 'del' === $action ) {
619
  $body = str_replace( '{ACTION}', $this->unsubscribe, $body );
620
  $subject = str_replace( '{ACTION}', $this->unsubscribe, $this->subscribe2_options['confirm_subject'] );
621
  }
subscribe2.php CHANGED
@@ -3,8 +3,8 @@
3
  Plugin Name: Subscribe2
4
  Plugin URI: https://subscribe2.wordpress.com/
5
  Description: Notifies an email list when new entries are posted.
6
- Version: 10.22
7
- Author: Matthew Robinson, Tanay Lakhani, Bryan Hadaway
8
  Author URI: https://subscribe2.wordpress.com/
9
  Licence: GPLv3
10
  Text Domain: subscribe2
3
  Plugin Name: Subscribe2
4
  Plugin URI: https://subscribe2.wordpress.com/
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 10.22.1
7
+ Author: Matthew Robinson, Tanay Lakhani
8
  Author URI: https://subscribe2.wordpress.com/
9
  Licence: GPLv3
10
  Text Domain: subscribe2