From c54a584e1d8b798473e8afa6a314d24e3479039e Mon Sep 17 00:00:00 2001 From: jaswsinc Date: Fri, 18 Dec 2015 07:44:08 -0900 Subject: [PATCH] Preparing v151218 --- s2member/changelog.md | 10 ++++++++++ s2member/checksum.txt | 2 +- s2member/includes/translations/s2member.pot | 10 +++++----- s2member/readme.txt | 18 ++++++++++++++---- s2member/s2member.php | 8 ++++---- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/s2member/changelog.md b/s2member/changelog.md index 0bbab89e..11e2b416 100644 --- a/s2member/changelog.md +++ b/s2member/changelog.md @@ -1,3 +1,13 @@ += v151218 = + +- (s2Member Pro) **Reminder Email Notification Exclusions:** It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816). + +- (s2Member) **PHP v7 Compat.:** This release addresses one remaining issue with the `preg_replace` `/e` modifier as reported in [this GitHub issue](https://github.com/websharks/s2member/issues/811). Props @nerdworker for reporting. Thanks! + +- (s2Member/s2Member Pro) **WP v4.4 Compat.:** This release corrects an issue that impacted sites attempting to run s2Member on a Multisite Network; i.e., it corrects a problem with the `load.php` patch against the latest release of WordPress. Props @crazycoolcam for reporting! See also [this GitHub issue](https://github.com/websharks/s2member/issues/812). + +- (s2Member/s2Member Pro) **Getting Help:** This release adds a new menu page titled, "Getting Help w/ s2Member". This new section of your Dashboard provides quick & easy access to s2Member KB articles, suggestions, and our tech support department (for pro customers). Props @patdumond @raamdev. See also [this GitHub issue](https://github.com/websharks/s2member/issues/814). + = v151210 = - (s2Member/s2Member Pro) **WP/PHP Compat:** Updated for compatibility with WordPress 4.4 and PHP v7.0. Note that s2Member and s2Member Pro also remain compatible with WordPress 4.3 and PHP 5.2. However, PHP 5.5+ is strongly recommended. diff --git a/s2member/checksum.txt b/s2member/checksum.txt index be16d799..b99d3a32 100644 --- a/s2member/checksum.txt +++ b/s2member/checksum.txt @@ -1 +1 @@ -95ca15ddfbbd89600e1ac81f5ac3e577 \ No newline at end of file +35a15209842402cdccb9dd5222d6bd47 \ No newline at end of file diff --git a/s2member/includes/translations/s2member.pot b/s2member/includes/translations/s2member.pot index a6d7b692..62d8da1f 100644 --- a/s2member/includes/translations/s2member.pot +++ b/s2member/includes/translations/s2member.pot @@ -2,9 +2,9 @@ # This file is distributed under the same license as the package. msgid "" msgstr "" -"Project-Id-Version: 151210\n" +"Project-Id-Version: 151218\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n" -"POT-Creation-Date: 2015-12-10 11:40:46+00:00\n" +"POT-Creation-Date: 2015-12-18 16:43:20+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1128,12 +1128,12 @@ msgctxt "s2member-front" msgid "`strong` (i.e., use numbers, letters, mixed caSe, and punctuation)" msgstr "" -#: s2member/includes/classes/users-list-in.inc.php:349 +#: s2member/includes/classes/users-list-in.inc.php:362 msgctxt "s2member-front" msgid "Additional Profile Fields" msgstr "" -#: s2member/includes/classes/users-list-in.inc.php:349 +#: s2member/includes/classes/users-list-in.inc.php:362 msgctxt "s2member-front" msgid "(for this site)" msgstr "" @@ -4265,7 +4265,7 @@ msgctxt "s2member-front" msgid "My Profile Summary" msgstr "" -#: s2member-pro/s2member-pro/includes/classes/reminders.inc.php:232 +#: s2member-pro/s2member-pro/includes/classes/reminders.inc.php:239 msgid "0 / non-recurring" msgstr "" diff --git a/s2member/readme.txt b/s2member/readme.txt index aa4fd64e..8198df58 100644 --- a/s2member/readme.txt +++ b/s2member/readme.txt @@ -1,7 +1,7 @@ === s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) === -Version: 151210 -Stable tag: 151210 +Version: 151218 +Stable tag: 151218 SSL Compatible: yes bbPress® Compatible: yes @@ -25,7 +25,7 @@ Tested up to PHP: 7.0 Copyright: © 2009 WebSharks, Inc. License: GNU General Public License v2 or later. -Contributors: WebSharks, JasWSInc, anguz, raamdev, sitegeek, kristineds +Contributors: WebSharks, JasWSInc, anguz, raamdev, sitegeek, KristineDS Author: s2Member® / WebSharks, Inc. Author URI: http://s2member.com/ @@ -169,12 +169,22 @@ Released under the terms of the [GNU General Public License](http://www.gnu.org/ == Upgrade Notice == -= v151210 = += v151218 = (Maintenance Release) Upgrade immediately. == Changelog == += v151218 = + +- (s2Member Pro) **Reminder Email Notification Exclusions:** It is now possible to enable/disable EOT Renewal/Reminder Email notifications on a per-user basis. You can edit a user's profile in the WP Dashboard and check "_No (exclude)_" to prevent specific users from receiving any reminder emails that you configured. Props at @patdumond @luisrock. See also [this GitHub issue](https://github.com/websharks/s2member/issues/816). + +- (s2Member) **PHP v7 Compat.:** This release addresses one remaining issue with the `preg_replace` `/e` modifier as reported in [this GitHub issue](https://github.com/websharks/s2member/issues/811). Props @nerdworker for reporting. Thanks! + +- (s2Member/s2Member Pro) **WP v4.4 Compat.:** This release corrects an issue that impacted sites attempting to run s2Member on a Multisite Network; i.e., it corrects a problem with the `load.php` patch against the latest release of WordPress. Props @crazycoolcam for reporting! See also [this GitHub issue](https://github.com/websharks/s2member/issues/812). + +- (s2Member/s2Member Pro) **Getting Help:** This release adds a new menu page titled, "Getting Help w/ s2Member". This new section of your Dashboard provides quick & easy access to s2Member KB articles, suggestions, and our tech support department (for pro customers). Props @patdumond @raamdev. See also [this GitHub issue](https://github.com/websharks/s2member/issues/814). + = v151210 = - (s2Member/s2Member Pro) **WP/PHP Compat:** Updated for compatibility with WordPress 4.4 and PHP v7.0. Note that s2Member and s2Member Pro also remain compatible with WordPress 4.3 and PHP 5.2. However, PHP 5.5+ is strongly recommended. diff --git a/s2member/s2member.php b/s2member/s2member.php index 08dd7cc8..ef134646 100644 --- a/s2member/s2member.php +++ b/s2member/s2member.php @@ -19,8 +19,8 @@ */ /* -- This section for WordPress parsing. ------------------------------------------------------------------------------ -Version: 151210 -Stable tag: 151210 +Version: 151218 +Stable tag: 151218 SSL Compatible: yes bbPress Compatible: yes @@ -81,7 +81,7 @@ * @var string */ if(!defined('WS_PLUGIN__S2MEMBER_VERSION')) - define('WS_PLUGIN__S2MEMBER_VERSION', '151210' /* !#distro-version#! */); + define('WS_PLUGIN__S2MEMBER_VERSION', '151218' /* !#distro-version#! */); /** * Minimum PHP version required to run s2Member. * @@ -111,7 +111,7 @@ * @var string */ if(!defined('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION')) - define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', '151210' /* !#distro-version#! */); + define('WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION', '151218' /* !#distro-version#! */); /* Several compatibility checks. If all pass, load the s2Member plugin.