From 377cdd17a4138a3fc0d94b088e63fcb98b4541b2 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 29 Jul 2015 00:18:33 -0500
Subject: [PATCH 01/10] Add space between attributes to resolve HTML validation
 error.

Reported in https://wordpress.org/support/topic/no-space-between-attributes-1
---
 class-bjgk-genesis-enews-extended.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index a92580b..a212e12 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -116,7 +116,7 @@ function widget( $args, $instance ) {
 			</form>
 		<?php elseif ( ! empty( $instance['action'] ) ) : ?>
 			<form id="subscribe<?php echo $this->id; ?>" action="<?php echo esc_attr( $instance['action'] ); ?>" method="post" <?php if ($instance['open_same_window'] == 0 ) : ?> target="_blank"<?php endif; ?> onsubmit="if ( subbox1.value == '<?php echo esc_js( $instance['fname_text'] ); ?>') { subbox1.value = ''; } if ( subbox2.value == '<?php echo esc_js( $instance['lname_text'] ); ?>') { subbox2.value = ''; }" name="<?php echo esc_attr( $this->id ); ?>">
-				<?php if ( ! empty($instance['fname-field'] ) ) : ?><label for="subbox1" class="screenread"><?php echo esc_attr( $instance['fname_text'] ); ?></label><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>"name="<?php echo esc_attr( $instance['fname-field'] ); ?>" /><?php endif ?>
+				<?php if ( ! empty($instance['fname-field'] ) ) : ?><label for="subbox1" class="screenread"><?php echo esc_attr( $instance['fname_text'] ); ?></label><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="<?php echo esc_attr( $instance['fname-field'] ); ?>" /><?php endif ?>
 				<?php if ( ! empty($instance['lname-field'] ) ) : ?><label for="subbox2" class="screenread"><?php echo esc_attr( $instance['lname_text'] ); ?></label><input type="text" id="subbox2" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="<?php echo esc_attr( $instance['lname-field'] ); ?>" /><?php endif ?>
 				<label for="subbox" class="screenread"><?php echo esc_attr( $instance['input_text'] ); ?></label><input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="<?php echo esc_js( $instance['email-field'] ); ?>" <?php if ( current_theme_supports( 'html5' ) ) : ?>required="required"<?php endif; ?> />
 				<?php echo $instance['hidden_fields']; ?>
@@ -133,8 +133,8 @@ function widget( $args, $instance ) {
 					<?php echo esc_html( $success_message ); ?>
 				</div>
 				<?php endif; ?>
-				<?php if ( isset( $instance['mailpoet-show-fname'] ) ) : ?><label for="subbox1" class="screenread"><?php echo esc_attr( $instance['fname_text'] ); ?></label><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>"name="mailpoet-firstname" /><?php endif ?>
-				<?php if ( isset( $instance['mailpoet-show-lname'] ) ) : ?><label for="subbox2" class="screenread"><?php echo esc_attr( $instance['lname_text'] ); ?></label><input type="text" id="subbox2" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>"name="mailpoet-lastname" /><?php endif ?>
+				<?php if ( isset( $instance['mailpoet-show-fname'] ) ) : ?><label for="subbox1" class="screenread"><?php echo esc_attr( $instance['fname_text'] ); ?></label><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="mailpoet-firstname" /><?php endif ?>
+				<?php if ( isset( $instance['mailpoet-show-lname'] ) ) : ?><label for="subbox2" class="screenread"><?php echo esc_attr( $instance['lname_text'] ); ?></label><input type="text" id="subbox2" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="mailpoet-lastname" /><?php endif ?>
 				<label for="subbox" class="screenread"><?php echo esc_attr( $instance['input_text'] ); ?></label><input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="mailpoet-email" <?php if ( current_theme_supports( 'html5' ) ) : ?>required="required"<?php endif; ?> />
 				<?php echo $instance['hidden_fields']; ?>
 				<input type="hidden" name="submission-type" value="mailpoet" />

From 049b3c35a9277e26bc9ac7b4cbe3fdccbc07d5a9 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 29 Jul 2015 10:12:01 -0500
Subject: [PATCH 02/10] Check for mailpoet settings before validating them.
 Fixes #119 props: norcross

---
 class-bjgk-genesis-enews-extended.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index a212e12..da07644 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -167,8 +167,14 @@ function update( $new_instance, $old_instance ) {
 		$new_instance['hidden_fields']   = strip_tags( $new_instance['hidden_fields'], "<div>, <fieldset>, <input>, <label>, <legend>, <option>, <optgroup>, <select>, <textarea>" );
 		$new_instance['after_text']      = wp_kses_post( $new_instance['after_text']);
 		$new_instance['id']              = str_replace("http://feeds.feedburner.com/", "", $new_instance['id']);
-		$new_instance['mailpoet_check']  = wp_kses_post( $new_instance['mailpoet_check'] );
-		$new_instance['mailpoet_subbed'] = wp_kses_post( $new_instance['mailpoet_subbed'] );
+		if ( isset( $new_instance['mailpoet_check'] ) ) {
+			$new_instance['mailpoet_check']  = wp_kses_post( $new_instance['mailpoet_check'] );
+		}
+
+		if ( isset( $new_instance['mailpoet_subbed'] ) ) {
+			$new_instance['mailpoet_subbed']  = wp_kses_post( $new_instance['mailpoet_subbed'] );
+		}
+
 		return $new_instance;
 	}
 

From 6800e187a4848f301825e51a9e5223e73c486abe Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 16 Sep 2015 17:18:55 -0500
Subject: [PATCH 03/10] Readme Updates

Tested to 4.4, added text domain.
---
 readme.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index f6e45b9..a97b06b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,8 @@ Contributors: kraftbj, coffeaweb
 Donate link: https://kraft.im/donate/
 Tags: genesis, genesiswp, mailchimp, aweber, studiopress, newsletter, subscribe, mailpoet, wysija
 Requires at least: 3.0
-Tested up to: 4.3
+Tested up to: 4.4
+Text Domain: genesis-enews-extended
 Stable tag: 2.0.1
 
 Creates a new widget to easily add mailing lists integration to a Genesis website. Works with FeedBurner, MailChimp, AWeber, FeedBlitz and more.
@@ -180,4 +181,4 @@ A special thanks to all who have contributed to Genesis eNews Extended.
 = StudioPress =
 * Special thanks to Brian Gardner and the team at StudioPress who wrote the original code that provided the foundation for the plugin.
 
-If you're not listed and think you should be, please drop me a note. Any omission is, in no way, intentional.
\ No newline at end of file
+If you're not listed and think you should be, please drop me a note. Any omission is, in no way, intentional.

From 71e6c6941e142f43af23b33de97dc0c578d64bf7 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 16 Sep 2015 17:19:27 -0500
Subject: [PATCH 04/10] Readme: Remove coffeaweb

My old freelance name that I don't see myself using anytime soon.
---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index a97b06b..853a6da 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === Genesis eNews Extended ===
-Contributors: kraftbj, coffeaweb
+Contributors: kraftbj
 Donate link: https://kraft.im/donate/
 Tags: genesis, genesiswp, mailchimp, aweber, studiopress, newsletter, subscribe, mailpoet, wysija
 Requires at least: 3.0

From f46ddb725ee83d4e817ac555fd5189ea43c3fffd Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Fri, 23 Oct 2015 14:13:42 -0500
Subject: [PATCH 05/10] Remove en_GB. At 100% on t.w.org

---
 languages/genesis-enews-extended-en_GB.mo | Bin 2572 -> 0 bytes
 languages/genesis-enews-extended-en_GB.po | 143 ----------------------
 2 files changed, 143 deletions(-)
 delete mode 100644 languages/genesis-enews-extended-en_GB.mo
 delete mode 100644 languages/genesis-enews-extended-en_GB.po

diff --git a/languages/genesis-enews-extended-en_GB.mo b/languages/genesis-enews-extended-en_GB.mo
deleted file mode 100644
index cfd5d406db917182350cc58e67e1c9b6c15d8856..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2572
zcmeH{$!{D*6vhh(5QaVMi{JqYBL#XEV=U8Nz}pyu?O4gM30bJ8yJn_vPgPS@?XeFC
zq5K0}kRoy7f;dJ<a6&of!WB3mPKZ;u!U2%@-gJ)_q#WUt*3|sEmag}GuU_}hr%rq-
za6MkOzrfRIKiz;oT-l96+zx&KPJkbR4}q7!yTB{p9pDe(z2Gn4YvAu-1zfmEh<m_w
z@Bwfe<oz7@F!&LOrQ#xZKlmAVCwK|G4ZIBA4PGhde=O&J1HZxepWrj#S0{vc7W^J$
zJ%59&vvPA0=V=f>F@wJ+!3FSJc#J^S^Te%%zcU~|w+*t69OV5jfb8QFko|oQvcIe4
z_#YtqJ9)C)4`hF5K=!u;vcDF{`@RdZKLxTsSI%E3=P!cn?+cLqZDTR}`xs<BUxKXj
zYmno72eQ9kLH2hQ<Rg3(jn}i*@rBfkVsihnauD)I{!W2>j!5fBA8>GS9M;Z$?kh)G
z1J}VLXq-pZ@E{s{<$UmU3mR;UYD_HV-WyGAx#z`FU&cGMZ*ogYcg!AXGbC>)HoB|q
zpqO!a$Hi7<UKw2z%gSYGwC|`K?nvqyI}j_uMx;_&ND?cZ8+ThurpdUornB4^fmgJb
zR_R_5p(SO~$*q=_)|RO+t)!t!Q%YnMd$k*RNxm;B&Yd>{G9x99Ix;oGnrJEOJZ(k;
zdE}Ogz=v~mBzOyYX#qPMEmozLPB{ulZpxvfl|3(YA``J{@H4$s){m(Zuc{=Gy4c@|
z^=KUX;I0gP*gq1PQ?zBIr*-ALIOrk1HXi=0mD;EKG`5}8Xe{u!JQ^Ci<B%oar|~w=
zQ$$@WC21H*rALM-OY@%6H9C*s*@*g9cIT?6U6p)fd(zKUJ87hMs`KMLs;+#5vZyBs
zb@G<6$rc}J&Dh>-J(?GrkQ(81oV2?tmX2~Ksb8d}%jfNC;%tT-l~ojRqKo~MCWnK9
zZk?Fn%i??=^)@;x7YeROY8x62E_7KwpVaa3MTu&Y<%II76z`b4x+_tRF|@dDo+5t-
zwVBk!mNoCo*avG#@TRm5TEc52wQ^2o#`<8x^;8lp<~<j*O-Oz3v#?%A#*=KEh`Nt@
z^<Ggs0Wfp{)Q>8svURo{ELl0S9W0}GLz-wbCxb>aXuO2musIRFIQd+o5jGlF9GsK8
zie>$4ZF7<u)8XV)(3rwHE~lVvBkj`28ynIh?i1wobsKd(&1QKgRq-pGVswWGYq1&3
z<3Ziaah5?_MuU(J`XNdE-s)myV{K#QFfq+qqq1c1a%x1|&mi5yR~>J>(lZqIBkNE#
zZ?s#%^x-;I)s;3_(XmPJQin9%QNFU3<~B+LK0_ChMk%7}<|byi#Be*O>8Uwt&Q#tG
qxX5kc3$I6_JT+@mwHGS?*~e;d?Qhj+>c~5L{Zn=QQ}sW6s{R50FwGJG

diff --git a/languages/genesis-enews-extended-en_GB.po b/languages/genesis-enews-extended-en_GB.po
deleted file mode 100644
index 97b938b..0000000
--- a/languages/genesis-enews-extended-en_GB.po
+++ /dev/null
@@ -1,143 +0,0 @@
-# Translation of Genesis eNews Extended in English (UK)
-# This file is distributed under the same license as the Genesis eNews Extended package.
-msgid ""
-msgstr ""
-"Project-Id-Version: Genesis eNews Extended\n"
-"Report-Msgid-Bugs-To: http://wordpress.org/tag/genesis-enews-extended\n"
-"POT-Creation-Date: 2014-01-09 20:12:54+00:00\n"
-"PO-Revision-Date: 2014-01-14 08:46-0600\n"
-"Last-Translator: Brandon Kraft <public@brandonkraft.com>\n"
-"Language-Team: \n"
-"Language: en_GB\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.6.3\n"
-
-#: class-bjgk-genesis-enews-extended.php:53
-msgid "Displays subscribe form"
-msgstr "Displays subscribe form"
-
-#: class-bjgk-genesis-enews-extended.php:56
-msgid "Genesis - eNews Extended"
-msgstr "Genesis - eNews Extended"
-
-#: class-bjgk-genesis-enews-extended.php:127
-msgid "Check your inbox now to confirm your subscription."
-msgstr "Check your inbox now to confirm your subscription."
-
-#: class-bjgk-genesis-enews-extended.php:127
-msgid "You've successfully subscribed."
-msgstr "You've successfully subscribed."
-
-#: class-bjgk-genesis-enews-extended.php:182
-msgid "Title"
-msgstr "Title"
-
-#: class-bjgk-genesis-enews-extended.php:187
-msgid "Text To Show Before Form"
-msgstr "Text To Show Before Form"
-
-#: class-bjgk-genesis-enews-extended.php:191
-msgid "Text To Show After Form"
-msgstr "Text To Show After Form"
-
-#: class-bjgk-genesis-enews-extended.php:197
-msgid "MailPoet List"
-msgstr "MailPoet List"
-
-#: class-bjgk-genesis-enews-extended.php:217
-msgid "Show Fields:"
-msgstr "Show Fields:"
-
-#: class-bjgk-genesis-enews-extended.php:220
-#: class-bjgk-genesis-enews-extended.php:275
-msgid "First Name"
-msgstr "First Name"
-
-#: class-bjgk-genesis-enews-extended.php:224
-#: class-bjgk-genesis-enews-extended.php:280
-msgid "Last Name"
-msgstr "Last Name"
-
-#: class-bjgk-genesis-enews-extended.php:232
-msgid ""
-"MailPoet is not currently activated. Genesis eNews Extended works with "
-"MailPoet, a free newsletter plugin. See <a href='%s' "
-"target='blank'>MailPoet's plugin page on WordPress.org</a>"
-msgstr ""
-"MailPoet is not currently activated. Genesis eNews Extended works with "
-"MailPoet, a free newsletter plugin. See <a href='%s' "
-"target='blank'>MailPoet's plugin page on WordPress.org</a>"
-
-#: class-bjgk-genesis-enews-extended.php:238
-msgid "Google/Feedburner ID"
-msgstr "Google/Feedburner ID"
-
-#: class-bjgk-genesis-enews-extended.php:240
-msgid ""
-"Entering your Feedburner ID here will deactivate the custom options below."
-msgstr ""
-"Entering your Feedburner ID here will deactivate the custom options below."
-
-#: class-bjgk-genesis-enews-extended.php:244
-msgid "Form Action"
-msgstr "Form Action"
-
-#: class-bjgk-genesis-enews-extended.php:249
-msgid "E-Mail Field"
-msgstr "E-Mail Field"
-
-#: class-bjgk-genesis-enews-extended.php:254
-msgid "First Name Field"
-msgstr "First Name Field"
-
-#: class-bjgk-genesis-enews-extended.php:259
-msgid "Last Name Field"
-msgstr "Last Name Field"
-
-#: class-bjgk-genesis-enews-extended.php:264
-msgid "Hidden Fields"
-msgstr "Hidden Fields"
-
-#: class-bjgk-genesis-enews-extended.php:266
-msgid "Not all services use hidden fields."
-msgstr "Not all services use hidden fields."
-
-#: class-bjgk-genesis-enews-extended.php:271
-msgid "Open confirmation page in same window?"
-msgstr "Open confirmation page in same window?"
-
-#: class-bjgk-genesis-enews-extended.php:276
-msgid "First Name Input Text"
-msgstr "First Name Input Text"
-
-#: class-bjgk-genesis-enews-extended.php:281
-msgid "Last Name Input Text"
-msgstr "Last Name Input Text"
-
-#: class-bjgk-genesis-enews-extended.php:285
-msgid "E-Mail Address"
-msgstr "Email Address"
-
-#: class-bjgk-genesis-enews-extended.php:286
-msgid "E-Mail Input Text"
-msgstr "Email Input Text"
-
-#: class-bjgk-genesis-enews-extended.php:291
-msgid "Go"
-msgstr "Go"
-
-#: class-bjgk-genesis-enews-extended.php:292
-msgid "Button Text"
-msgstr "Button Text"
-
-#~ msgid "First Name..."
-#~ msgstr "First Name..."
-
-#~ msgid "Last Name..."
-#~ msgstr "Last Name..."
-
-#~ msgid "Enter your email address..."
-#~ msgstr "Enter your email address..."

From 156891f43fa9b995f6431e2505558e27c9889c36 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Tue, 15 Dec 2015 12:45:41 -0600
Subject: [PATCH 06/10] Remove MailPoet ad. Fixes #121

---
 class-bjgk-genesis-enews-extended.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index da07644..680df04 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -247,10 +247,6 @@ function form( $instance ) {
 				</p>
 			</fieldset>
 
-		<?php else : ?>
-			<br/>
-			<small><?php printf( __( "MailPoet is not currently activated. Genesis eNews Extended works with MailPoet, a free newsletter plugin. See <a href='%s' target='blank'>MailPoet's plugin page on WordPress.org</a>", 'genesis-enews-extended' ), 'http://wordpress.org/plugins/wysija-newsletters' ); ?></small>
-
 		<?php endif; ?>
 		</p>
 		<hr style="background: #ccc; border: 0; height: 1px; margin: 20px 0;">

From 22a3138a50c1628590bd5a52b7fc0bace01395f7 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Tue, 23 Feb 2016 09:36:54 -0600
Subject: [PATCH 07/10] Update readme.txt

---
 readme.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/readme.txt b/readme.txt
index 853a6da..74a68e4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -52,6 +52,9 @@ Questions can be asked at the [WordPress.org Support Forum](http://wordpress.org
 
 == Changelog ==
 
+= 2.0.2 =
+* Fixes minor issue that led to HTML validation issues.
+
 = 2.0.1 =
 * Corrects typo impacting Last Name field text placeholder.
 

From 81c126e189dbb5ecc43321fe37162d4f29c74ac8 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Tue, 23 Feb 2016 09:38:50 -0600
Subject: [PATCH 08/10] Update readme.txt

---
 readme.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.txt b/readme.txt
index 74a68e4..a8fb777 100644
--- a/readme.txt
+++ b/readme.txt
@@ -54,6 +54,7 @@ Questions can be asked at the [WordPress.org Support Forum](http://wordpress.org
 
 = 2.0.2 =
 * Fixes minor issue that led to HTML validation issues.
+* Fixes PHP notice for checking non-existent variables in some cases.
 
 = 2.0.1 =
 * Corrects typo impacting Last Name field text placeholder.

From 2b860ad090466ffb750ca8078dd89a4c8106506f Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 24 Feb 2016 12:10:18 -0600
Subject: [PATCH 09/10] Version bump

---
 class-bjgk-genesis-enews-extended.php | 2 +-
 plugin.php                            | 4 ++--
 readme.txt                            | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index 680df04..cf5d73e 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package   BJGK\Genesis_enews_extended
- * @version   2.0.1
+ * @version   2.0.2
  * @author    Brandon Kraft <public@brandonkraft.com>
  * @link      http://www.brandonkraft.com/genesis-enews-extended/
  * @copyright Copyright (c) 2012-2015, Brandon Kraft
diff --git a/plugin.php b/plugin.php
index 4a23fcf..57b5c9a 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package     BJGK\Genesis_enews_extended
- * @version     2.0.1
+ * @version     2.0.2
  * @author      Brandon Kraft <public@brandonkraft.com>
  * @copyright   Copyright (c) 2012-2015, Brandon Kraft
  * @link        https://kraft.im/genesis-enews-extended/
@@ -13,7 +13,7 @@
  * Plugin Name: Genesis eNews Extended
  * Plugin URI:  https://kraft.im/genesis-enews-extended/
  * Description: Replaces the Genesis eNews Widget to allow easier use of additional mailing services.
- * Version:     2.0.1
+ * Version:     2.0.2
  * Author:      Brandon Kraft
  * Author URI:  https://kraft.im
  * License:     GPL-2.0+
diff --git a/readme.txt b/readme.txt
index a8fb777..cf7c861 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: genesis, genesiswp, mailchimp, aweber, studiopress, newsletter, subscribe,
 Requires at least: 3.0
 Tested up to: 4.4
 Text Domain: genesis-enews-extended
-Stable tag: 2.0.1
+Stable tag: 2.0.2
 
 Creates a new widget to easily add mailing lists integration to a Genesis website. Works with FeedBurner, MailChimp, AWeber, FeedBlitz and more.
 
@@ -186,3 +186,9 @@ A special thanks to all who have contributed to Genesis eNews Extended.
 * Special thanks to Brian Gardner and the team at StudioPress who wrote the original code that provided the foundation for the plugin.
 
 If you're not listed and think you should be, please drop me a note. Any omission is, in no way, intentional.
+
+
+== Upgrade Notice ==
+
+= 2.0.2 =
+Fixes minor bugs, including one that causes HTML validation errors.
\ No newline at end of file

From d636188acf7ad2b49ced1670fe454a954b2bb2d1 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Wed, 24 Feb 2016 12:14:01 -0600
Subject: [PATCH 10/10] MailPoet: Hide all mention if not active

---
 class-bjgk-genesis-enews-extended.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index cf5d73e..2be83da 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -204,14 +204,14 @@ function form( $instance ) {
 		</p>
 
 		<hr style="background-color: #ccc; border: 0; height: 1px; margin: 20px 0;">
-		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'mailpoet-list' ) ); ?>"><?php _e( 'MailPoet List', 'genesis-enews-extended' ); ?>:</label>
 		<?php if ( class_exists( 'WYSIJA' ) ) :
 			$mp_model_list = WYSIJA::get( 'list','model' );
 			$mp_lists = $mp_model_list->get( array( 'name','list_id' ), array(
 				'is_enabled' => 1,
 			) );
 		?>
+		<p>
+			<label for="<?php echo esc_attr( $this->get_field_id( 'mailpoet-list' ) ); ?>"><?php _e( 'MailPoet List', 'genesis-enews-extended' ); ?>:</label>
 			<fieldset>
 				<ul>
 					<?php foreach ( $mp_lists as $mp_list ) : ?>
@@ -246,10 +246,9 @@ function form( $instance ) {
 					<textarea id="<?php echo esc_attr( $this->get_field_id( 'mailpoet_subbed' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'mailpoet_subbed' ) ); ?>" class="widefat" rows="6" cols="4"><?php echo htmlspecialchars( $instance['mailpoet_subbed'] ); ?></textarea>
 				</p>
 			</fieldset>
-
-		<?php endif; ?>
 		</p>
 		<hr style="background: #ccc; border: 0; height: 1px; margin: 20px 0;">
+		<?php endif; ?>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>"><?php _e( 'Google/Feedburner ID', 'genesis-enews-extended' ); ?>:</label>
 			<input type="text" id="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'id' ) ); ?>" value="<?php echo esc_attr( $instance['id'] ); ?>" class="widefat" /><br />