Merge branch 'release/170425-RC' of github.com:websharks/s2member int…

…o release/170425-RC
wpsharks · May 19, 2017 · 2d50fe4 · 2d50fe4
2 parents 353d3fd + 5578a86
commit 2d50fe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitchange b/.gitchange
@@ -1,2 +1,2 @@
 1490143716
-2ea258a033ce686450ef6bccbc0f66efdba74ac1:58f5f6ae276e65.23286114
+2ea258a033ce686450ef6bccbc0f66efdba74ac1:591f566b1a0a98.78790473
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@
 
 - (s2Member/s2Member Pro) **Bug Fix:** Resolving internal warning: 'PHP Warning: Illegal string offset 'user_id' in s2member/src/includes/classes/sc-eots-in.inc.php'. This was resolved by typecasting `$attr` to an array in cases where WordPress core passes this as a string; e.g., when there are no attributes.
 
+- (s2Member Pro) **Bug Fix:** Incorrect default option value for `reject_prepaid=""` attribute in Stripe Pro-Forms. See: [Issue #1089](https://github.com/websharks/s2member/issues/1089)
+
 = v170221 =
 
 - (s2Member/s2Member Pro) **JW Player v7:** This release adds support for JW Player v7 in the `[s2Stream /]` shortcode. See [Issue #774](https://github.com/websharks/s2member/issues/774).