From b3afb192193e30f652a75b9f55c9c5ddcccad8e1 Mon Sep 17 00:00:00 2001 From: Lekhnath Pandey Date: Mon, 14 Sep 2020 12:46:46 +0545 Subject: [PATCH] Version bump to 1.8.7.1 Squashed with following commit: Fix - Conditional Logic compatibility with WordPress 5.5 --- CHANGELOG.txt | 3 +++ includes/class-ur-emailer.php | 1 - languages/user-registration.pot | 28 ++++++++++++++-------------- package.json | 2 +- readme.txt | 5 ++++- templates/form-registration.php | 7 ++++--- user-registration.php | 4 ++-- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0fbac2346..0a3efa053 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ += 1.8.7.1 - 14/09/2020 +* Fix - Conditional logic compatibility with WordPress 5.5 + = 1.8.7 - 09/09/2020 * Enhance - Filter Users with approval status and specific UR forms. * Enhance - Add placeholder option in the Date field. diff --git a/includes/class-ur-emailer.php b/includes/class-ur-emailer.php index 1f7d42c0d..cb5f0fc6d 100644 --- a/includes/class-ur-emailer.php +++ b/includes/class-ur-emailer.php @@ -213,7 +213,6 @@ public static function ur_profile_details_changed_mail( $user_id, $form_id ) { // Check if value contains array. // @codingStandardsIgnoreStart $value = ur_clean( isset( $single_field[ $key ] ) ? $single_field[ $key ] : '' ); - if ( isset( $single_field[ $key ] ) && is_array( $single_field[ $key ] ) ) { $value = implode( ',', $single_field[ $key ] ); } diff --git a/languages/user-registration.pot b/languages/user-registration.pot index 099ee8aa6..0e83de7e3 100644 --- a/languages/user-registration.pot +++ b/languages/user-registration.pot @@ -2,14 +2,14 @@ # This file is distributed under the same license as the User Registration plugin. msgid "" msgstr "" -"Project-Id-Version: User Registration 1.8.7\n" +"Project-Id-Version: User Registration 1.8.7.1\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/user-registration\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2020-09-08T18:15:37+05:45\n" +"POT-Creation-Date: 2020-09-14T12:11:09+05:45\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.4.0\n" "X-Domain: user-registration\n" @@ -1391,7 +1391,7 @@ msgid "The email subject you want to customize." msgstr "" #: includes/admin/settings/emails/class-ur-settings-admin-email.php:69 -#: includes/class-ur-emailer.php:348 +#: includes/class-ur-emailer.php:347 msgid "A New User Registered" msgstr "" @@ -1447,7 +1447,7 @@ msgid "Enable this email sent to user notifying the registration is awaiting adm msgstr "" #: includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php:60 -#: includes/class-ur-emailer.php:292 +#: includes/class-ur-emailer.php:291 msgid "Thank you for registration on {{blog_info}}" msgstr "" @@ -1472,7 +1472,7 @@ msgid "Email sent to the user with a verification link when email confirmation t msgstr "" #: includes/admin/settings/emails/class-ur-settings-email-confirmation.php:52 -#: includes/class-ur-emailer.php:283 +#: includes/class-ur-emailer.php:282 msgid "Please confirm your registration on {{blog_info}}" msgstr "" @@ -1501,7 +1501,7 @@ msgid "Enable this email sent to the admin when a user changed profile informati msgstr "" #: includes/admin/settings/emails/class-ur-settings-profile-details-changed-email.php:70 -#: includes/class-ur-emailer.php:490 +#: includes/class-ur-emailer.php:489 msgid "Profile Details Changed Email: {{blog_info}}" msgstr "" @@ -1531,7 +1531,7 @@ msgid "Enable this email sent to the user notifying the registration is approved msgstr "" #: includes/admin/settings/emails/class-ur-settings-registration-approved-email.php:60 -#: includes/class-ur-emailer.php:415 +#: includes/class-ur-emailer.php:414 msgid "Congratulations! Registration approved on {{blog_info}}" msgstr "" @@ -1560,8 +1560,8 @@ msgid "Enable this email sent to the user notifying the registration is denied b msgstr "" #: includes/admin/settings/emails/class-ur-settings-registration-denied-email.php:60 -#: includes/class-ur-emailer.php:303 -#: includes/class-ur-emailer.php:403 +#: includes/class-ur-emailer.php:302 +#: includes/class-ur-emailer.php:402 msgid "Sorry! Registration denied on {{blog_info}}" msgstr "" @@ -1590,7 +1590,7 @@ msgid "Enable this email sent to the user notifying the registration is pending. msgstr "" #: includes/admin/settings/emails/class-ur-settings-registration-pending-email.php:61 -#: includes/class-ur-emailer.php:391 +#: includes/class-ur-emailer.php:390 msgid "Sorry! Registration changed to pending on {{blog_info}}" msgstr "" @@ -1621,7 +1621,7 @@ msgid "Enable this email sent to the user when a user requests for reset passwor msgstr "" #: includes/admin/settings/emails/class-ur-settings-reset-password-email.php:59 -#: includes/class-ur-emailer.php:446 +#: includes/class-ur-emailer.php:445 msgid "Password Reset Email: {{blog_info}}" msgstr "" @@ -1654,7 +1654,7 @@ msgid "Enable this email sent to the user after successful user registration." msgstr "" #: includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php:60 -#: includes/class-ur-emailer.php:314 +#: includes/class-ur-emailer.php:313 msgid "Congratulations! Registration Complete on {{blog_info}}" msgstr "" @@ -2014,7 +2014,7 @@ msgid "Email not verified! Verify your email by clicking on the link sent to you msgstr "" #: includes/class-ur-emailer.php:146 -#: includes/class-ur-emailer.php:595 +#: includes/class-ur-emailer.php:594 msgid "Chosen Password" msgstr "" @@ -4145,7 +4145,7 @@ msgstr "" msgid "Total" msgstr "" -#: templates/form-registration.php:152 +#: templates/form-registration.php:153 msgid "Form not found, form id :" msgstr "" diff --git a/package.json b/package.json index 77814c62a..b74883526 100644 --- a/package.json +++ b/package.json @@ -43,4 +43,4 @@ "dependencies": { "grunt-cli": "^1.3.2" } -} +} \ No newline at end of file diff --git a/readme.txt b/readme.txt index d6f99ac92..8a804aea9 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: user registration, registration, user profile, registration form, login fo Requires at least: 4.0 Requires PHP: 5.3 Tested up to: 5.5.1 -Stable tag: 1.8.7 +Stable tag: 1.8.7.1 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -148,6 +148,9 @@ Yes, the plugin has a shortcode for the login form. == Changelog == += 1.8.7.1 - 14/09/2020 +* Fix - Conditional logic compatibility with WordPress 5.5 + = 1.8.7 - 09/09/2020 * Enhance - Filter Users with approval status and specific UR forms. * Enhance - Add placeholder option in the Date field. diff --git a/templates/form-registration.php b/templates/form-registration.php index b63d3c669..7ca37e103 100644 --- a/templates/form-registration.php +++ b/templates/form-registration.php @@ -87,9 +87,10 @@ // Migrate the conditional logic to logic_map schema. $single_item = class_exists( 'URCL_Field_Settings' ) && method_exists( URCL_Field_Settings::class, 'migrate_to_logic_map_schema' ) ? URCL_Field_Settings::migrate_to_logic_map_schema( $single_item ) : $single_item; - $cl_enabled = isset( $single_item->advance_setting->enable_conditional_logic ) && '1' === $single_item->advance_setting->enable_conditional_logic ? 'yes' : 'no'; - $cl_map = ''; - $cl_props = sprintf( 'data-conditional-logic-enabled="%s"', esc_attr( $cl_enabled ) ); + $enabled_status = isset( $single_item->advance_setting->enable_conditional_logic ) ? $single_item->advance_setting->enable_conditional_logic : ''; + $cl_enabled = '1' === $enabled_status || 'on' === $enabled_status ? 'yes' : 'no'; + $cl_map = ''; + $cl_props = sprintf( 'data-conditional-logic-enabled="%s"', esc_attr( $cl_enabled ) ); if ( 'yes' === $cl_enabled && isset( $single_item->advance_setting->cl_map ) ) { $cl_map = esc_attr( $single_item->advance_setting->cl_map ); diff --git a/user-registration.php b/user-registration.php index 233e8ff8c..b111423cc 100644 --- a/user-registration.php +++ b/user-registration.php @@ -3,7 +3,7 @@ * Plugin Name: User Registration * Plugin URI: https://wpeverest.com/plugins/user-registration * Description: Drag and Drop user registration form and login form builder. - * Version: 1.8.7 + * Version: 1.8.7.1 * Author: WPEverest * Author URI: https://wpeverest.com * Text Domain: user-registration @@ -31,7 +31,7 @@ final class UserRegistration { * * @var string */ - public $version = '1.8.7'; + public $version = '1.8.7.1'; /** * Session instance.