From ae10c79b3360aaf427d701c465fc092782889a45 Mon Sep 17 00:00:00 2001 From: Champ Camba Date: Thu, 7 Feb 2019 20:54:40 +0800 Subject: [PATCH 1/2] remove notices --- includes/core/class-fields.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 86a17830..9d0f3ac0 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -187,6 +187,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) { if ( isset( $fields[ $id ] ) ) { $condition_fields = get_option( 'um_fields' ); + if( ! is_array( $condition_fields ) ) $condition_fields = array(); + foreach ( $condition_fields as $key => $value ) { $deleted_field = array_search( $id, $value ); From 586132e9d3904a4f840bc745b767bdf88ec32f52 Mon Sep 17 00:00:00 2001 From: Champ Camba Date: Thu, 7 Feb 2019 20:55:33 +0800 Subject: [PATCH 2/2] Add translatable dynamic strings in register form notices --- includes/admin/templates/role/register.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/includes/admin/templates/role/register.php b/includes/admin/templates/role/register.php index b3787983..a8664e88 100644 --- a/includes/admin/templates/role/register.php +++ b/includes/admin/templates/role/register.php @@ -10,7 +10,7 @@ 'type' => 'select', 'label' => __( 'Registration Status', 'ultimate-member' ), 'tooltip' => __( 'Select the status you would like this user role to have after they register on your site', 'ultimate-member' ), - 'value' => ! empty( $role['_um_status'] ) ? $role['_um_status'] : array(), + 'value' => ! empty( $role['_um_status'] ) ? __( $role['_um_status'] , 'ultimate-member' ) : array(), 'options' => array( 'approved' => __( 'Auto Approve', 'ultimate-member' ), 'checkmail' => __( 'Require Email Activation', 'ultimate-member' ), @@ -22,7 +22,7 @@ 'type' => 'select', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), - 'value' => ! empty( $role['_um_auto_approve_act'] ) ? $role['_um_auto_approve_act'] : array(), + 'value' => ! empty( $role['_um_auto_approve_act'] ) ? __( $role['_um_auto_approve_act'], 'ultimate-member' ) : array(), 'options' => array( 'redirect_profile' => __( 'Redirect to profile', 'ultimate-member' ), 'redirect_url' => __( 'Redirect to URL', 'ultimate-member' ), @@ -33,7 +33,7 @@ 'id' => '_um_auto_approve_url', 'type' => 'text', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), - 'value' => ! empty( $role['_um_auto_approve_url'] ) ? $role['_um_auto_approve_url'] : '', + 'value' => ! empty( $role['_um_auto_approve_url'] ) ? __( $role['_um_auto_approve_url'], 'ultimate-member' ) : '', 'conditional' => array( '_um_auto_approve_act', '=', 'redirect_url' ) ), array( @@ -41,7 +41,7 @@ 'type' => 'checkbox', 'label' => __( 'Login user after validating the activation link?', 'ultimate-member' ), 'tooltip' => __( 'Login the user after validating the activation link', 'ultimate-member' ), - 'value' => ! empty( $role['_um_login_email_activate'] ) ? $role['_um_login_email_activate'] : 0, + 'value' => ! empty( $role['_um_login_email_activate'] ) ? __( $role['_um_login_email_activate'], 'ultimate-member' ) : 0, 'conditional' => array( '_um_status', '=', 'checkmail' ) ), array( @@ -49,7 +49,7 @@ 'type' => 'select', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), - 'value' => ! empty( $role['_um_checkmail_action'] ) ? $role['_um_checkmail_action'] : array(), + 'value' => ! empty( $role['_um_checkmail_action'] ) ? __( $role['_um_checkmail_action'], 'ultimate-member' ) : array(), 'options' => array( 'show_message' => __( 'Show custom message', 'ultimate-member' ), 'redirect_url' => __( 'Redirect to URL', 'ultimate-member' ), @@ -60,14 +60,14 @@ 'id' => '_um_checkmail_message', 'type' => 'textarea', 'label' => __( 'Personalize the custom message', 'ultimate-member' ), - 'value' => ! empty( $role['_um_checkmail_message'] ) ? $role['_um_checkmail_message'] : __('Thank you for registering. Before you can login we need you to activate your account by clicking the activation link in the email we just sent you.','ultimate-member'), + 'value' => ! empty( $role['_um_checkmail_message'] ) ? __( $role['_um_checkmail_message'], 'ultimate-member' ) : __('Thank you for registering. Before you can login we need you to activate your account by clicking the activation link in the email we just sent you.','ultimate-member'), 'conditional' => array( '_um_checkmail_action', '=', 'show_message' ) ), array( 'id' => '_um_checkmail_url', 'type' => 'text', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), - 'value' => ! empty( $role['_um_checkmail_url'] ) ? $role['_um_checkmail_url'] : '', + 'value' => ! empty( $role['_um_checkmail_url'] ) ? __( $role['_um_checkmail_url'], 'ultimate-member' ) : '', 'conditional' => array( '_um_checkmail_action', '=', 'redirect_url' ) ), array( @@ -75,7 +75,7 @@ 'type' => 'text', 'label' => __( 'URL redirect after e-mail activation', 'ultimate-member' ), 'tooltip' => __( 'If you want users to go to a specific page other than login page after e-mail activation, enter the URL here.', 'ultimate-member' ), - 'value' => ! empty( $role['_um_url_email_activate'] ) ? $role['_um_url_email_activate'] : '', + 'value' => ! empty( $role['_um_url_email_activate'] ) ? __( $role['_um_url_email_activate'], 'ultimate-member' ) : '', 'conditional' => array( '_um_status', '=', 'checkmail' ), ), array( @@ -83,7 +83,7 @@ 'type' => 'select', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), - 'value' => ! empty( $role['_um_pending_action'] ) ? $role['_um_pending_action'] : array(), + 'value' => ! empty( $role['_um_pending_action'] ) ? __( $role['_um_pending_action'], 'ultimate-member' ) : array(), 'options' => array( 'show_message' => __( 'Show custom message', 'ultimate-member' ), 'redirect_url' => __( 'Redirect to URL', 'ultimate-member' ), @@ -94,7 +94,7 @@ 'id' => '_um_pending_message', 'type' => 'textarea', 'label' => __( 'Personalize the custom message', 'ultimate-member' ), - 'value' => ! empty( $role['_um_pending_message'] ) ? $role['_um_pending_message'] : __('Thank you for applying for membership to our site. We will review your details and send you an email letting you know whether your application has been successful or not.','ultimate-member'), + 'value' => ! empty( $role['_um_pending_message'] ) ? __( $role['_um_pending_message'], 'ultimate-member' ) : __('Thank you for applying for membership to our site. We will review your details and send you an email letting you know whether your application has been successful or not.','ultimate-member'), 'conditional' => array( '_um_pending_action', '=', 'show_message' ) ), array( @@ -102,7 +102,7 @@ 'type' => 'text', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'conditional' => array( '_um_pending_action', '=', 'redirect_url' ), - 'value' => ! empty( $role['_um_pending_url'] ) ? $role['_um_pending_url'] : '', + 'value' => ! empty( $role['_um_pending_url'] ) ? __( $role['_um_pending_url'], 'ultimate-member' ) : '', ), ) ) )->render_form(); ?>