User registration &amp; user profile

Version Description

Fix: Default placeholder for URL field so it can be replaced using the general filter
Fix: HTML for the Login form Remember Me checkbox. Improved CSS
Fix: A notice in relation to Elementor
Misc: Use WP Timzeone when saving users last profile update date with the Toolbox option
Misc: Allow Login form strings to be changed using the Labels Edit functionality
Misc: Added a filter over the Content Restriction redirect url

Release Info

Developer	raster02
Plugin	User registration & user profile – Profile Builder
Version	3.4.7
Comparing to
See all releases

Code changes from version 3.4.6 to 3.4.7

Files changed (10) hide show

admin/advanced-settings/includes/forms/save-last-profile-update.php +4 -1
assets/css/style-front-end.css +16 -1
features/content-restriction/content-restriction-functions.php +2 -3
front-end/class-formbuilder.php +39 -34
front-end/login.php +15 -13
front-end/recover.php +2 -0
index.php +2 -2
readme.txt +9 -1
translation/profile-builder.catalog.php +6 -0
translation/profile-builder.pot +82 -58

admin/advanced-settings/includes/forms/save-last-profile-update.php CHANGED Viewed

	@@ -2,5 +2,8 @@
2
3	add_action( 'wppb_edit_profile_success', 'wppb_toolbox_save_last_update_date', 20, 3 );
4	function wppb_toolbox_save_last_update_date( $http_request, $form_name, $user_id ) {
5	- ~~update_user_meta~~( $user_id, ~~'last_profile_update_date',~~ ~~apply_filters~~( '~~wppb_convert_date_format~~', ~~date( 'Y-m-d H:i:s'~~ ) ) );



6	}


2
3	add_action( 'wppb_edit_profile_success', 'wppb_toolbox_save_last_update_date', 20, 3 );
4	function wppb_toolbox_save_last_update_date( $http_request, $form_name, $user_id ) {
5	+ if ( empty($user_id) \|\| !function_exists( 'wp_timezone' ) ) return;
6	+
7	+ $now = new DateTime( 'now', wp_timezone() );
8	+ update_user_meta( $user_id, 'last_profile_update_date', apply_filters( 'wppb_convert_date_format', $now->format( 'Y-m-d H:i:s' ) ) );
9	}

assets/css/style-front-end.css CHANGED Viewed

	@@ -196,6 +196,21 @@
196	float:left;
197	}
198















199	.wppb-form-field.wppb-timepicker select {
200	width: auto;
201	margin-right: 5px;
	@@ -896,4 +911,4 @@ li.wppb-facet-search{
896	float: left;
897	border: 1px solid #ccc;
898	border-radius: 3px;
899	- }


196	float:left;
197	}
198
199	+ #wppb-login-wrap .login-remember {
200	+ display: flex;
201	+ align-items: center;
202	+ }
203	+
204	+ #wppb-login-wrap .login-remember input {
205	+ cursor: pointer;
206	+ }
207	+
208	+ #wppb-login-wrap .login-remember label {
209	+ padding-left: 8px;
210	+ margin-bottom: 0px;
211	+ cursor: pointer;
212	+ }
213	+
214	.wppb-form-field.wppb-timepicker select {
215	width: auto;
216	margin-right: 5px;

911	float: left;
912	border: 1px solid #ccc;
913	border-radius: 3px;
914	+ }

features/content-restriction/content-restriction-functions.php CHANGED Viewed

	@@ -176,9 +176,9 @@ function wppb_content_restriction_post_redirect() {
176
177	// Redirect
178	nocache_headers();
179	- wp_redirect( wppb_add_missing_http( $redirect_url ) );
180	exit;
181	-
182	}
183	add_action( 'template_redirect', 'wppb_content_restriction_post_redirect' );
184
	@@ -311,4 +311,3 @@ function wppb_content_restriction_shortcode( $atts, $content = null ) {
311
312	}
313	add_shortcode( 'wppb-restrict', 'wppb_content_restriction_shortcode' );
314	-


176
177	// Redirect
178	nocache_headers();
179	+ wp_redirect( apply_filters( 'wppb_restricted_post_redirect_url', wppb_add_missing_http( $redirect_url ) ) );
180	exit;
181	+
182	}
183	add_action( 'template_redirect', 'wppb_content_restriction_post_redirect' );
184

311
312	}
313	add_shortcode( 'wppb-restrict', 'wppb_content_restriction_shortcode' );

front-end/class-formbuilder.php CHANGED Viewed

	@@ -42,6 +42,9 @@ class Profile_Builder_Form_Creator{
42	global $wppb_shortcode_on_front;
43	$wppb_shortcode_on_front = true;
44



45	if( empty( $this->args['form_fields'] ) )
46	$this->args['form_fields'] = apply_filters( 'wppb_change_form_fields', get_option( 'wppb_manage_fields' ), $this->args );
47
	@@ -142,55 +145,57 @@ class Profile_Builder_Form_Creator{
142	}
143
144	function wppb_form_logic() {
145	- if( $this->args['form_type'] == ~~'register'~~ ){
146	- ~~$registration = apply_filters~~ ( '~~wppb_register_setting_override~~', ~~true~~ ~~);//used to be get_option(~~ '~~users_can_register~~' )

147
148	- if ( !is_user_logged_in() ){
149	- if ( !$registration )
150	- echo apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Only an administrator can add new users.', 'profile-builder')).'</p>' );
151
152	- elseif ( $registration ){
153	- $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '' ) );
154	- }
155
156	- }else{
157	- $current_user_capability = apply_filters ( 'wppb_registration_user_capability', 'create_users' );
158
159	- if ( current_user_can( $current_user_capability ) && $registration )
160	- $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Users can register themselves or you can manually create users here.', 'profile-builder')). '<img src="'.WPPB_PLUGIN_URL.'assets/images/pencil_delete.png" title="'.esc_attr(__( 'This message is only visible by administrators', 'profile-builder' )).'"/>' . '</p>' ) );
161
162	- elseif ( current_user_can( $current_user_capability ) && !$registration )
163	- $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Users cannot currently register themselves, but you can manually create users here.', 'profile-builder')). '<img src="'.WPPB_PLUGIN_URL.'assets/images/pencil_delete.png" title="'.esc_attr(__( 'This message is only visible by administrators', 'profile-builder' )).'"/>' . '</p>' ) );
164
165	- elseif ( !current_user_can( $current_user_capability ) ){
166	- global $user_ID;
167
168	- $userdata = get_userdata( $user_ID );
169	- $display_name = ( ( $userdata->data->display_name == '' ) ? $userdata->data->user_login : $userdata->data->display_name );
170
171	- $wppb_general_settings = get_option( 'wppb_general_settings' );
172	- if ( isset( $wppb_general_settings['loginWith'] ) && ( $wppb_general_settings['loginWith'] == 'email' ) )
173	- $display_name = $userdata->data->user_email;
174
175	- if( empty( $this->args['logout_redirect_url'] ) ) {
176	- $this->args['logout_redirect_url'] = get_permalink();
177	- }
178
179	- // CHECK FOR REDIRECT
180	- $this->args['logout_redirect_url'] = wppb_get_redirect_url( $this->args['redirect_priority'], 'after_logout', $this->args['logout_redirect_url'], $userdata );
181	- $this->args['logout_redirect_url'] = apply_filters( 'wppb_after_logout_redirect_url', $this->args['logout_redirect_url'] );
182
183	- echo apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.sprintf( __( "You are currently logged in as %1s. You don't need another account. %2s", 'profile-builder' ), '<a href="'.get_author_posts_url( $user_ID ).'" title="'.$display_name.'">'.$display_name.'</a>', '<a href="'.wp_logout_url( $this->args['logout_redirect_url'] ).'" title="'.__( 'Log out of this account.', 'profile-builder' ).'">'.__( 'Logout', 'profile-builder' ).' »</a>' ).'</p>', $user_ID );

184	}
185	- }
186
187	- }elseif ( $this->args['form_type'] == 'edit_profile' ){
188	- if ( !is_user_logged_in() )
189	- echo apply_filters( 'wppb_edit_profile_user_not_logged_in_message', '<p class="warning" id="wppb_edit_profile_user_not_logged_in_message">'.esc_html(__( 'You must be logged in to edit your profile.', 'profile-builder' )) .'</p>' );
190
191	- elseif ( is_user_logged_in() )
192	- $this->wppb_form_content( apply_filters( 'wppb_edit_profile_logged_in_user_message', '' ) );
193

194	}
195	}
196


42	global $wppb_shortcode_on_front;
43	$wppb_shortcode_on_front = true;
44
45	+ global $wppb_register_edit_profile_shortcode_on_front;
46	+ $wppb_register_edit_profile_shortcode_on_front = true;
47	+
48	if( empty( $this->args['form_fields'] ) )
49	$this->args['form_fields'] = apply_filters( 'wppb_change_form_fields', get_option( 'wppb_manage_fields' ), $this->args );
50

145	}
146
147	function wppb_form_logic() {
148	+ if( isset( $this->args['form_type'] ) ) {
149	+ if( $this->args['form_type'] == 'register' ){
150	+ $registration = apply_filters ( 'wppb_register_setting_override', true );//used to be get_option( 'users_can_register' )
151
152	+ if ( !is_user_logged_in() ){
153	+ if ( !$registration )
154	+ echo apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Only an administrator can add new users.', 'profile-builder')).'</p>' );
155
156	+ elseif ( $registration ){
157	+ $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '' ) );
158	+ }
159
160	+ }else{
161	+ $current_user_capability = apply_filters ( 'wppb_registration_user_capability', 'create_users' );
162
163	+ if ( current_user_can( $current_user_capability ) && $registration )
164	+ $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Users can register themselves or you can manually create users here.', 'profile-builder')). '<img src="'.WPPB_PLUGIN_URL.'assets/images/pencil_delete.png" title="'.esc_attr(__( 'This message is only visible by administrators', 'profile-builder' )).'"/>' . '</p>' ) );
165
166	+ elseif ( current_user_can( $current_user_capability ) && !$registration )
167	+ $this->wppb_form_content( apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.esc_html(__( 'Users cannot currently register themselves, but you can manually create users here.', 'profile-builder')). '<img src="'.WPPB_PLUGIN_URL.'assets/images/pencil_delete.png" title="'.esc_attr(__( 'This message is only visible by administrators', 'profile-builder' )).'"/>' . '</p>' ) );
168
169	+ elseif ( !current_user_can( $current_user_capability ) ){
170	+ global $user_ID;
171
172	+ $userdata = get_userdata( $user_ID );
173	+ $display_name = ( ( $userdata->data->display_name == '' ) ? $userdata->data->user_login : $userdata->data->display_name );
174
175	+ $wppb_general_settings = get_option( 'wppb_general_settings' );
176	+ if ( isset( $wppb_general_settings['loginWith'] ) && ( $wppb_general_settings['loginWith'] == 'email' ) )
177	+ $display_name = $userdata->data->user_email;
178
179	+ if( empty( $this->args['logout_redirect_url'] ) ) {
180	+ $this->args['logout_redirect_url'] = get_permalink();
181	+ }
182
183	+ // CHECK FOR REDIRECT
184	+ $this->args['logout_redirect_url'] = wppb_get_redirect_url( $this->args['redirect_priority'], 'after_logout', $this->args['logout_redirect_url'], $userdata );
185	+ $this->args['logout_redirect_url'] = apply_filters( 'wppb_after_logout_redirect_url', $this->args['logout_redirect_url'] );
186
187	+ echo apply_filters( 'wppb_register_pre_form_message', '<p class="alert" id="wppb_register_pre_form_message">'.sprintf( __( "You are currently logged in as %1s. You don't need another account. %2s", 'profile-builder' ), '<a href="'.get_author_posts_url( $user_ID ).'" title="'.$display_name.'">'.$display_name.'</a>', '<a href="'.wp_logout_url( $this->args['logout_redirect_url'] ).'" title="'.__( 'Log out of this account.', 'profile-builder' ).'">'.__( 'Logout', 'profile-builder' ).' »</a>' ).'</p>', $user_ID );
188	+ }
189	}

190
191	+ }elseif ( $this->args['form_type'] == 'edit_profile' ){
192	+ if ( !is_user_logged_in() )
193	+ echo apply_filters( 'wppb_edit_profile_user_not_logged_in_message', '<p class="warning" id="wppb_edit_profile_user_not_logged_in_message">'.esc_html(__( 'You must be logged in to edit your profile.', 'profile-builder' )) .'</p>' );
194
195	+ elseif ( is_user_logged_in() )
196	+ $this->wppb_form_content( apply_filters( 'wppb_edit_profile_logged_in_user_message', '' ) );
197
198	+ }
199	}
200	}
201

front-end/login.php CHANGED Viewed

	@@ -100,19 +100,19 @@ function wppb_process_login(){
100	*/
101	function wppb_login_form( $args = array() ) {
102	$defaults = array(
103	- 'echo' => true,
104	// Default 'redirect' value takes the user back to the request URI.
105	- 'redirect' => esc_url( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ),
106	- 'form_id' => 'wppb-loginform',
107	- 'label_username' => __( 'Username or Email Address' ),
108	- 'label_password' => __( 'Password' ),
109	- 'label_remember' => __( 'Remember Me' ),
110	- 'label_log_in' => __( 'Log In' ),
111	- 'id_username' => 'user_login',
112	- 'id_password' => 'user_pass',
113	- 'id_remember' => 'rememberme',
114	- 'id_submit' => 'wp-submit',
115	- 'remember' => true,
116	'value_username' => '',
117	// Set 'value_remember' to true to default the "Remember me" checkbox to checked.
118	'value_remember' => false,
	@@ -162,7 +162,7 @@ function wppb_login_form( $args = array() ) {
162	<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
163	</p>
164	' . $login_form_middle . '
165	- ' . ( $args['remember'] ? '<p class="login-remember"><~~label><~~input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
166	<p class="login-submit">
167	<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="'. apply_filters( 'wppb_login_submit_class', "button button-primary" ) . '" value="' . esc_attr( $args['label_log_in'] ) . '" />
168	<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
	@@ -375,6 +375,8 @@ add_filter( 'login_redirect', 'wppb_login_redirect', 20, 3 );
375	function wppb_front_end_login( $atts ){
376	global $wppb_shortcode_on_front;
377	$wppb_shortcode_on_front = true;


378	/* define a global so we now we have the shortcode login present */
379	global $wppb_login_shortcode;
380	$wppb_login_shortcode = true;


100	*/
101	function wppb_login_form( $args = array() ) {
102	$defaults = array(
103	+ 'echo' => true,
104	// Default 'redirect' value takes the user back to the request URI.
105	+ 'redirect' => esc_url( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ),
106	+ 'form_id' => 'wppb-loginform',
107	+ 'label_username' => __( 'Username or Email Address', 'profile-builder' ),
108	+ 'label_password' => __( 'Password', 'profile-builder' ),
109	+ 'label_remember' => __( 'Remember Me', 'profile-builder' ),
110	+ 'label_log_in' => __( 'Log In', 'profile-builder' ),
111	+ 'id_username' => 'user_login',
112	+ 'id_password' => 'user_pass',
113	+ 'id_remember' => 'rememberme',
114	+ 'id_submit' => 'wp-submit',
115	+ 'remember' => true,
116	'value_username' => '',
117	// Set 'value_remember' to true to default the "Remember me" checkbox to checked.
118	'value_remember' => false,

162	<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
163	</p>
164	' . $login_form_middle . '
165	+ ' . ( $args['remember'] ? '<p class="login-remember"><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /><label for="' . esc_attr( $args['id_remember'] ) . '">' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
166	<p class="login-submit">
167	<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="'. apply_filters( 'wppb_login_submit_class', "button button-primary" ) . '" value="' . esc_attr( $args['label_log_in'] ) . '" />
168	<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />

375	function wppb_front_end_login( $atts ){
376	global $wppb_shortcode_on_front;
377	$wppb_shortcode_on_front = true;
378	+ global $wppb_login_shortcode_on_front;
379	+ $wppb_login_shortcode_on_front = true;
380	/* define a global so we now we have the shortcode login present */
381	global $wppb_login_shortcode;
382	$wppb_login_shortcode = true;

front-end/recover.php CHANGED Viewed

	@@ -251,6 +251,8 @@ function wppb_send_admin_password_reset_email( $user ){
251	function wppb_front_end_password_recovery(){
252	global $wppb_shortcode_on_front;
253	$wppb_shortcode_on_front = true;


254	$password_email_sent = false;
255	$password_changed_success = false;
256


251	function wppb_front_end_password_recovery(){
252	global $wppb_shortcode_on_front;
253	$wppb_shortcode_on_front = true;
254	+ global $wppb_password_recovery_shortcode_on_front;
255	+ $wppb_password_recovery_shortcode_on_front = true;
256	$password_email_sent = false;
257	$password_changed_success = false;
258

index.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: Profile Builder
4	Plugin URI: https://www.cozmoslabs.com/wordpress-profile-builder/
5	Description: Login, registration and edit profile shortcodes for the front-end. Also you can choose what fields should be displayed or add new (custom) ones both in the front-end and in the dashboard.
6	- Version: 3.4.6
7	Author: Cozmoslabs
8	Author URI: https://www.cozmoslabs.com/
9	Text Domain: profile-builder
	@@ -70,7 +70,7 @@ function wppb_free_plugin_init() {
70	*
71	*
72	*/
73	- define('PROFILE_BUILDER_VERSION', '3.4.6' );
74	define('WPPB_PLUGIN_DIR', plugin_dir_path(__FILE__));
75	define('WPPB_PLUGIN_URL', plugin_dir_url(__FILE__));
76	define('WPPB_PLUGIN_BASENAME', plugin_basename(__FILE__));


3	Plugin Name: Profile Builder
4	Plugin URI: https://www.cozmoslabs.com/wordpress-profile-builder/
5	Description: Login, registration and edit profile shortcodes for the front-end. Also you can choose what fields should be displayed or add new (custom) ones both in the front-end and in the dashboard.
6	+ Version: 3.4.7
7	Author: Cozmoslabs
8	Author URI: https://www.cozmoslabs.com/
9	Text Domain: profile-builder

70	*
71	*
72	*/
73	+ define('PROFILE_BUILDER_VERSION', '3.4.7' );
74	define('WPPB_PLUGIN_DIR', plugin_dir_path(__FILE__));
75	define('WPPB_PLUGIN_URL', plugin_dir_url(__FILE__));
76	define('WPPB_PLUGIN_BASENAME', plugin_basename(__FILE__));

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Donate link: http://www.cozmoslabs.com/wordpress-profile-builder/
4	Tags: user registration, user profile, user registration form, user fields, registration, edit profile, user custom fields, front-end login, front-end edit profile, front-end user registration, email confirmation, login form, content restriction, restrict content, profile
5	Requires at least: 3.1
6	Tested up to: 5.7
7	- Stable tag: 3.4.6
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -169,6 +169,14 @@ This plugin adds/removes user fields in the front-end. Both default and extra pr
169	15. Edit or Add New User Role
170
171	== Changelog ==








172	= 3.4.6 =
173	* Misc: Added a wrapper to the content restriction message
174	* Misc: Added individual classes to the register and lost password links from the login form


4	Tags: user registration, user profile, user registration form, user fields, registration, edit profile, user custom fields, front-end login, front-end edit profile, front-end user registration, email confirmation, login form, content restriction, restrict content, profile
5	Requires at least: 3.1
6	Tested up to: 5.7
7	+ Stable tag: 3.4.7
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

169	15. Edit or Add New User Role
170
171	== Changelog ==
172	+ = 3.4.7 =
173	+ * Fix: Default placeholder for URL field so it can be replaced using the general filter
174	+ * Fix: HTML for the Login form Remember Me checkbox. Improved CSS
175	+ * Fix: A notice in relation to Elementor
176	+ * Misc: Use WP Timzeone when saving users last profile update date with the Toolbox option
177	+ * Misc: Allow Login form strings to be changed using the Labels Edit functionality
178	+ * Misc: Added a filter over the Content Restriction redirect url
179	+
180	= 3.4.6 =
181	* Misc: Added a wrapper to the content restriction message
182	* Misc: Added individual classes to the register and lost password links from the login form

translation/profile-builder.catalog.php CHANGED Viewed

	@@ -1144,6 +1144,9 @@
1144	<?php __("User to edit:", "profile-builder"); ?>
1145	<?php __("Select User", "profile-builder"); ?>
1146	<?php __("Something went wrong. Please try again!", "profile-builder"); ?>



1147	<?php __("ERROR", "profile-builder"); ?>
1148	<?php __("The password you entered is incorrect.", "profile-builder"); ?>
1149	<?php __("Invalid username.", "profile-builder"); ?>
	@@ -1267,6 +1270,8 @@
1267	<?php __("Reset Link", "profile-builder"); ?>
1268	<?php __("Approve User Url", "profile-builder"); ?>
1269	<?php __("Approve User Link", "profile-builder"); ?>


1270	<?php __("Approved Fields", "profile-builder"); ?>
1271	<?php __("Unapproved Fields", "profile-builder"); ?>
1272	<?php __("Modified Fields", "profile-builder"); ?>
	@@ -1480,6 +1485,7 @@
1480	<?php __("Your account has been successfully created!", "profile-builder"); ?>
1481	<?php __("Something went wrong!", "profile-builder"); ?>
1482	<?php __("User not approved!", "profile-builder"); ?>

1483	<?php __("Do you wish to approve the registration?", "profile-builder"); ?>
1484	<?php __("The approval link is not valid! Please <a href=\"%s\"> log in </a> to approve the user manually. ", "profile-builder"); ?>
1485	<?php __("delete this user?", "profile-builder"); ?>


1144	<?php __("User to edit:", "profile-builder"); ?>
1145	<?php __("Select User", "profile-builder"); ?>
1146	<?php __("Something went wrong. Please try again!", "profile-builder"); ?>
1147	+ <?php __("Username or Email Address", "profile-builder"); ?>
1148	+ <?php __("Remember Me", "profile-builder"); ?>
1149	+ <?php __("Log In", "profile-builder"); ?>
1150	<?php __("ERROR", "profile-builder"); ?>
1151	<?php __("The password you entered is incorrect.", "profile-builder"); ?>
1152	<?php __("Invalid username.", "profile-builder"); ?>

1270	<?php __("Reset Link", "profile-builder"); ?>
1271	<?php __("Approve User Url", "profile-builder"); ?>
1272	<?php __("Approve User Link", "profile-builder"); ?>
1273	+ <?php __("Unapprove User Url", "profile-builder"); ?>
1274	+ <?php __("Unapprove User Link", "profile-builder"); ?>
1275	<?php __("Approved Fields", "profile-builder"); ?>
1276	<?php __("Unapproved Fields", "profile-builder"); ?>
1277	<?php __("Modified Fields", "profile-builder"); ?>

1485	<?php __("Your account has been successfully created!", "profile-builder"); ?>
1486	<?php __("Something went wrong!", "profile-builder"); ?>
1487	<?php __("User not approved!", "profile-builder"); ?>
1488	+ <?php __("Do you wish to unapprove the registration?", "profile-builder"); ?>
1489	<?php __("Do you wish to approve the registration?", "profile-builder"); ?>
1490	<?php __("The approval link is not valid! Please <a href=\"%s\"> log in </a> to approve the user manually. ", "profile-builder"); ?>
1491	<?php __("delete this user?", "profile-builder"); ?>

translation/profile-builder.pot CHANGED Viewed

	@@ -313,7 +313,7 @@ msgstr ""
313	msgid "Logout Label"
314	msgstr ""
315
316	- #: ../pb-add-on-custom-profile-menus/index.php:191, ../pb-add-on-custom-profile-menus/wppb-custom-profile-menus.php:16, front-end/class-formbuilder.php:~~183~~
317	msgid "Logout"
318	msgstr ""
319
	@@ -361,7 +361,7 @@ msgstr ""
361	msgid "Edit Profile"
362	msgstr ""
363
364	- #: ../pb-add-on-custom-profile-menus/index.php:311, ../pb-add-on-custom-profile-menus/wppb-custom-profile-menus.php:74, front-end/class-formbuilder.php:~~449~~, front-end/login.php:~~449~~, assets/misc/elementor/widgets/class-pb-widget-rf.php:32
365	msgid "Register"
366	msgstr ""
367
	@@ -2038,11 +2038,11 @@ msgstr ""
2038	msgid "Username and Email"
2039	msgstr ""
2040
2041	- #: admin/general-settings.php:296, admin/manage-fields.php:330, front-end/login.php:255, front-end/login.php:269, front-end/login.php:~~416~~, add-ons/custom-redirects/custom_redirects_admin.php:60, add-ons/email-customizer/email-customizer.php:28, add-ons/user-listing/userlisting.php:112, add-ons/user-listing/userlisting.php:328, add-ons/user-listing/userlisting.php:828, add-ons/user-listing/userlisting.php:2405, features/admin-approval/class-admin-approval.php:171, features/email-confirmation/class-email-confirmation.php:168, admin/advanced-settings/includes/views/view-fields.php:121
2042	msgid "Username"
2043	msgstr ""
2044
2045	- #: admin/general-settings.php:297, front-end/login.php:~~413~~, front-end/recover.php:119, add-ons/email-customizer/email-customizer.php:29, add-ons/user-listing/userlisting.php:118, add-ons/user-listing/userlisting.php:834, add-ons/user-listing/userlisting.php:2406, features/admin-approval/class-admin-approval.php:174, features/email-confirmation/class-email-confirmation.php:169, admin/advanced-settings/includes/shortcodes/resend-activation.php:9
2046	msgid "Email"
2047	msgstr ""
2048
	@@ -2590,7 +2590,7 @@ msgstr ""
2590	msgid "Share a little biographical information to fill out your profile. This may be shown publicly."
2591	msgstr ""
2592
2593	- #: admin/manage-fields.php:348, front-end/recover.php:72, add-ons/email-customizer/email-customizer.php:30
2594	msgid "Password"
2595	msgstr ""
2596
	@@ -4514,7 +4514,7 @@ msgstr ""
4514	msgid "Minimum length of %d characters."
4515	msgstr ""
4516
4517	- #: features/functions.php:790, front-end/recover.php:~~368~~, front-end/default-fields/password/password.php:56
4518	msgid "The password must have a minimum strength of %s"
4519	msgstr ""
4520
	@@ -4554,91 +4554,103 @@ msgstr ""
4554	msgid "You are not currently logged in."
4555	msgstr ""
4556
4557	- #: front-end/class-formbuilder.php:~~138~~
4558	msgid "The role of the created user set to the default role. Only an administrator can register a user with the role assigned to this form."
4559	msgstr ""
4560
4561	- #: front-end/class-formbuilder.php:~~189~~
4562	msgid "You must be logged in to edit your profile."
4563	msgstr ""
4564
4565	- #: front-end/class-formbuilder.php:~~183~~
4566	msgid "You are currently logged in as %1s. You don't need another account. %2s"
4567	msgstr ""
4568
4569	- #: front-end/class-formbuilder.php:~~183~~
4570	msgid "Log out of this account."
4571	msgstr ""
4572
4573	- #: front-end/class-formbuilder.php:~~163~~
4574	msgid "Users cannot currently register themselves, but you can manually create users here."
4575	msgstr ""
4576
4577	- #: front-end/class-formbuilder.php:~~163~~, front-end/class-formbuilder.php:~~160~~
4578	msgid "This message is only visible by administrators"
4579	msgstr ""
4580
4581	- #: front-end/class-formbuilder.php:~~160~~
4582	msgid "Users can register themselves or you can manually create users here."
4583	msgstr ""
4584
4585	- #: front-end/class-formbuilder.php:~~150~~
4586	msgid "Only an administrator can add new users."
4587	msgstr ""
4588
4589	- #: front-end/class-formbuilder.php:~~290~~, front-end/login.php:~~507~~
4590	msgid "You are not allowed to do this."
4591	msgstr ""
4592
4593	- #: front-end/class-formbuilder.php:~~392~~
4594	msgid "There was an error in the submitted form"
4595	msgstr ""
4596
4597	- #: front-end/class-formbuilder.php:~~381~~
4598	msgid "Your profile has been successfully updated!"
4599	msgstr ""
4600
4601	- #: front-end/class-formbuilder.php:~~348~~, front-end/class-formbuilder.php:~~355~~
4602	msgid "The account %1s has been successfully created!"
4603	msgstr ""
4604
4605	- #: front-end/class-formbuilder.php:~~351~~, front-end/class-formbuilder.php:~~361~~
4606	msgid "Before you can access your account %1s, you need to confirm your email address. Please check your inbox and click the activation link."
4607	msgstr ""
4608
4609	- #: front-end/class-formbuilder.php:~~357~~
4610	msgid "Before you can access your account %1s, an administrator has to approve it. You will be notified via email."
4611	msgstr ""
4612
4613	- #: front-end/class-formbuilder.php:~~452~~
4614	msgid "Update"
4615	msgstr ""
4616
4617	- #: front-end/class-formbuilder.php:~~449~~
4618	msgid "Add User"
4619	msgstr ""
4620
4621	- #: front-end/class-formbuilder.php:~~534~~
4622	msgid "Send these credentials via email."
4623	msgstr ""
4624
4625	- #: front-end/class-formbuilder.php:~~769~~
4626	msgid "There are no other users to edit"
4627	msgstr ""
4628
4629	- #: front-end/class-formbuilder.php:~~751~~
4630	msgid "User to edit:"
4631	msgstr ""
4632
4633	- #: front-end/class-formbuilder.php:~~753~~
4634	msgid "Select User"
4635	msgstr ""
4636
4637	- #: front-end/class-formbuilder.php:~~795~~
4638	msgid "Something went wrong. Please try again!"
4639	msgstr ""
4640
4641	- #: front-end/login.php:~~318, front-end/login.php:339, front-end/recover.php:18, front-end/recover.php:319, front-end/extra-fields/extra-fields.php:93~~












4642	msgid "ERROR"
4643	msgstr ""
4644
	@@ -4662,7 +4674,7 @@ msgstr ""
4662	msgid "Password Lost and Found."
4663	msgstr ""
4664
4665	- #: front-end/login.php:334, front-end/login.php:~~455~~
4666	msgid "Lost your password?"
4667	msgstr ""
4668
	@@ -4670,19 +4682,19 @@ msgstr ""
4670	msgid "Both fields are empty."
4671	msgstr ""
4672
4673	- #: front-end/login.php:~~494~~, front-end/logout.php:29
4674	msgid "Log out of this account"
4675	msgstr ""
4676
4677	- #: front-end/login.php:~~494~~, front-end/logout.php:16
4678	msgid "Log out »"
4679	msgstr ""
4680
4681	- #: front-end/login.php:~~495~~
4682	msgid "You are currently logged in as %1$s. %2$s"
4683	msgstr ""
4684
4685	- #: front-end/login.php:~~420~~, front-end/recover.php:123
4686	msgid "Username or Email"
4687	msgstr ""
4688
	@@ -4734,55 +4746,55 @@ msgstr ""
4734	msgid "%1$s has requested a password change via the password reset feature.<br/>His/her new password is:%2$s"
4735	msgstr ""
4736
4737	- #: front-end/recover.php:~~268~~
4738	msgid "You are already logged in. You can change your password on the edit profile form."
4739	msgstr ""
4740
4741	- #: front-end/recover.php:~~411~~
4742	msgid "The password must not be empty!"
4743	msgstr ""
4744
4745	- #: front-end/recover.php:~~353~~, front-end/recover.php:~~436~~
4746	msgid "Invalid key!"
4747	msgstr ""
4748
4749	- #: front-end/recover.php:~~358~~
4750	msgid "The entered passwords don't match!"
4751	msgstr ""
4752
4753	- #: front-end/recover.php:~~364~~, front-end/default-fields/password/password.php:52
4754	msgid "The password must have the minimum length of %s characters"
4755	msgstr ""
4756
4757	- #: front-end/recover.php:~~375~~
4758	msgid "Your password has been successfully changed!"
4759	msgstr ""
4760
4761	- #: front-end/recover.php:~~292~~
4762	msgid "The username entered wasn't found in the database!"
4763	msgstr ""
4764
4765	- #: front-end/recover.php:~~292~~
4766	msgid "Please check that you entered the correct username."
4767	msgstr ""
4768
4769	- #: front-end/recover.php:~~335~~
4770	msgid "The email address entered wasn't found in the database!"
4771	msgstr ""
4772
4773	- #: front-end/recover.php:~~335~~
4774	msgid "Please check that you entered the correct email address."
4775	msgstr ""
4776
4777	- #: front-end/recover.php:~~305~~
4778	msgid "Check your email for the confirmation link."
4779	msgstr ""
4780
4781	- #: front-end/recover.php:~~319~~
4782	msgid "There was an error while trying to send the activation link to %1$s!"
4783	msgstr ""
4784
4785	- #: front-end/recover.php:~~436~~
4786	msgid "ERROR:"
4787	msgstr ""
4788
	@@ -5147,27 +5159,35 @@ msgstr ""
5147	msgid "Approve User Link"
5148	msgstr ""
5149
5150	- #: add-ons/email-customizer/email-customizer.php:58








5151	msgid "Approved Fields"
5152	msgstr ""
5153
5154	- #: add-ons/email-customizer/email-customizer.php:59
5155	msgid "Unapproved Fields"
5156	msgstr ""
5157
5158	- #: add-ons/email-customizer/email-customizer.php:63
5159	msgid "Modified Fields"
5160	msgstr ""
5161
5162	- #: add-ons/email-customizer/email-customizer.php:64
5163	msgid "Approval URL"
5164	msgstr ""
5165
5166	- #: add-ons/email-customizer/email-customizer.php:~~575~~
5167	msgid "The users selected password at signup"
5168	msgstr ""
5169
5170	- #: add-ons/email-customizer/email-customizer.php:~~583~~, add-ons/email-customizer/email-customizer.php:~~590~~, add-ons/email-customizer/email-customizer.php:~~604~~, features/email-confirmation/email-confirmation.php:594
5171	msgid "Your selected password at signup"
5172	msgstr ""
5173
	@@ -5976,11 +5996,11 @@ msgstr ""
5976	msgid "User successfully deleted!"
5977	msgstr ""
5978
5979	- #: features/admin-approval/admin-approval.php:90
5980	msgid "User successfully unapproved!"
5981	msgstr ""
5982
5983	- #: features/admin-approval/admin-approval.php:80, features/admin-approval/admin-approval.php:~~357~~
5984	msgid "User successfully approved!"
5985	msgstr ""
5986
	@@ -6028,19 +6048,23 @@ msgstr ""
6028	msgid "Your account has been successfully created!"
6029	msgstr ""
6030
6031	- #: features/admin-approval/admin-approval.php:~~315~~
6032	msgid "Something went wrong!"
6033	msgstr ""
6034
6035	- #: features/admin-approval/admin-approval.php:~~311~~
6036	msgid "User not approved!"
6037	msgstr ""
6038
6039	- #: features/admin-approval/admin-approval.php:~~296~~




6040	msgid "Do you wish to approve the registration?"
6041	msgstr ""
6042
6043	- #: features/admin-approval/admin-approval.php:~~336~~
6044	msgid "The approval link is not valid! Please <a href=\"%s\"> log in </a> to approve the user manually. "
6045	msgstr ""
6046


313	msgid "Logout Label"
314	msgstr ""
315
316	+ #: ../pb-add-on-custom-profile-menus/index.php:191, ../pb-add-on-custom-profile-menus/wppb-custom-profile-menus.php:16, front-end/class-formbuilder.php:187
317	msgid "Logout"
318	msgstr ""
319

361	msgid "Edit Profile"
362	msgstr ""
363
364	+ #: ../pb-add-on-custom-profile-menus/index.php:311, ../pb-add-on-custom-profile-menus/wppb-custom-profile-menus.php:74, front-end/class-formbuilder.php:454, front-end/login.php:451, assets/misc/elementor/widgets/class-pb-widget-rf.php:32
365	msgid "Register"
366	msgstr ""
367

2038	msgid "Username and Email"
2039	msgstr ""
2040
2041	+ #: admin/general-settings.php:296, admin/manage-fields.php:330, front-end/login.php:255, front-end/login.php:269, front-end/login.php:418, add-ons/custom-redirects/custom_redirects_admin.php:60, add-ons/email-customizer/email-customizer.php:28, add-ons/user-listing/userlisting.php:112, add-ons/user-listing/userlisting.php:328, add-ons/user-listing/userlisting.php:828, add-ons/user-listing/userlisting.php:2405, features/admin-approval/class-admin-approval.php:171, features/email-confirmation/class-email-confirmation.php:168, admin/advanced-settings/includes/views/view-fields.php:121
2042	msgid "Username"
2043	msgstr ""
2044
2045	+ #: admin/general-settings.php:297, front-end/login.php:415, front-end/recover.php:119, add-ons/email-customizer/email-customizer.php:29, add-ons/user-listing/userlisting.php:118, add-ons/user-listing/userlisting.php:834, add-ons/user-listing/userlisting.php:2406, features/admin-approval/class-admin-approval.php:174, features/email-confirmation/class-email-confirmation.php:169, admin/advanced-settings/includes/shortcodes/resend-activation.php:9
2046	msgid "Email"
2047	msgstr ""
2048

2590	msgid "Share a little biographical information to fill out your profile. This may be shown publicly."
2591	msgstr ""
2592
2593	+ #: admin/manage-fields.php:348, front-end/login.php:108, front-end/recover.php:72, add-ons/email-customizer/email-customizer.php:30
2594	msgid "Password"
2595	msgstr ""
2596

4514	msgid "Minimum length of %d characters."
4515	msgstr ""
4516
4517	+ #: features/functions.php:790, front-end/recover.php:370, front-end/default-fields/password/password.php:56
4518	msgid "The password must have a minimum strength of %s"
4519	msgstr ""
4520

4554	msgid "You are not currently logged in."
4555	msgstr ""
4556
4557	+ #: front-end/class-formbuilder.php:141
4558	msgid "The role of the created user set to the default role. Only an administrator can register a user with the role assigned to this form."
4559	msgstr ""
4560
4561	+ #: front-end/class-formbuilder.php:193
4562	msgid "You must be logged in to edit your profile."
4563	msgstr ""
4564
4565	+ #: front-end/class-formbuilder.php:187
4566	msgid "You are currently logged in as %1s. You don't need another account. %2s"
4567	msgstr ""
4568
4569	+ #: front-end/class-formbuilder.php:187
4570	msgid "Log out of this account."
4571	msgstr ""
4572
4573	+ #: front-end/class-formbuilder.php:167
4574	msgid "Users cannot currently register themselves, but you can manually create users here."
4575	msgstr ""
4576
4577	+ #: front-end/class-formbuilder.php:167, front-end/class-formbuilder.php:164
4578	msgid "This message is only visible by administrators"
4579	msgstr ""
4580
4581	+ #: front-end/class-formbuilder.php:164
4582	msgid "Users can register themselves or you can manually create users here."
4583	msgstr ""
4584
4585	+ #: front-end/class-formbuilder.php:154
4586	msgid "Only an administrator can add new users."
4587	msgstr ""
4588
4589	+ #: front-end/class-formbuilder.php:295, front-end/login.php:509
4590	msgid "You are not allowed to do this."
4591	msgstr ""
4592
4593	+ #: front-end/class-formbuilder.php:397
4594	msgid "There was an error in the submitted form"
4595	msgstr ""
4596
4597	+ #: front-end/class-formbuilder.php:386
4598	msgid "Your profile has been successfully updated!"
4599	msgstr ""
4600
4601	+ #: front-end/class-formbuilder.php:353, front-end/class-formbuilder.php:360
4602	msgid "The account %1s has been successfully created!"
4603	msgstr ""
4604
4605	+ #: front-end/class-formbuilder.php:356, front-end/class-formbuilder.php:366
4606	msgid "Before you can access your account %1s, you need to confirm your email address. Please check your inbox and click the activation link."
4607	msgstr ""
4608
4609	+ #: front-end/class-formbuilder.php:362
4610	msgid "Before you can access your account %1s, an administrator has to approve it. You will be notified via email."
4611	msgstr ""
4612
4613	+ #: front-end/class-formbuilder.php:457
4614	msgid "Update"
4615	msgstr ""
4616
4617	+ #: front-end/class-formbuilder.php:454
4618	msgid "Add User"
4619	msgstr ""
4620
4621	+ #: front-end/class-formbuilder.php:539
4622	msgid "Send these credentials via email."
4623	msgstr ""
4624
4625	+ #: front-end/class-formbuilder.php:774
4626	msgid "There are no other users to edit"
4627	msgstr ""
4628
4629	+ #: front-end/class-formbuilder.php:756
4630	msgid "User to edit:"
4631	msgstr ""
4632
4633	+ #: front-end/class-formbuilder.php:758
4634	msgid "Select User"
4635	msgstr ""
4636
4637	+ #: front-end/class-formbuilder.php:800
4638	msgid "Something went wrong. Please try again!"
4639	msgstr ""
4640
4641	+ #: front-end/login.php:107
4642	+ msgid "Username or Email Address"
4643	+ msgstr ""
4644	+
4645	+ #: front-end/login.php:109
4646	+ msgid "Remember Me"
4647	+ msgstr ""
4648	+
4649	+ #: front-end/login.php:110
4650	+ msgid "Log In"
4651	+ msgstr ""
4652	+
4653	+ #: front-end/login.php:318, front-end/login.php:339, front-end/recover.php:18, front-end/recover.php:321, front-end/extra-fields/extra-fields.php:93
4654	msgid "ERROR"
4655	msgstr ""
4656

4674	msgid "Password Lost and Found."
4675	msgstr ""
4676
4677	+ #: front-end/login.php:334, front-end/login.php:457
4678	msgid "Lost your password?"
4679	msgstr ""
4680

4682	msgid "Both fields are empty."
4683	msgstr ""
4684
4685	+ #: front-end/login.php:496, front-end/logout.php:29
4686	msgid "Log out of this account"
4687	msgstr ""
4688
4689	+ #: front-end/login.php:496, front-end/logout.php:16
4690	msgid "Log out »"
4691	msgstr ""
4692
4693	+ #: front-end/login.php:497
4694	msgid "You are currently logged in as %1$s. %2$s"
4695	msgstr ""
4696
4697	+ #: front-end/login.php:422, front-end/recover.php:123
4698	msgid "Username or Email"
4699	msgstr ""
4700

4746	msgid "%1$s has requested a password change via the password reset feature.<br/>His/her new password is:%2$s"
4747	msgstr ""
4748
4749	+ #: front-end/recover.php:270
4750	msgid "You are already logged in. You can change your password on the edit profile form."
4751	msgstr ""
4752
4753	+ #: front-end/recover.php:413
4754	msgid "The password must not be empty!"
4755	msgstr ""
4756
4757	+ #: front-end/recover.php:355, front-end/recover.php:438
4758	msgid "Invalid key!"
4759	msgstr ""
4760
4761	+ #: front-end/recover.php:360
4762	msgid "The entered passwords don't match!"
4763	msgstr ""
4764
4765	+ #: front-end/recover.php:366, front-end/default-fields/password/password.php:52
4766	msgid "The password must have the minimum length of %s characters"
4767	msgstr ""
4768
4769	+ #: front-end/recover.php:377
4770	msgid "Your password has been successfully changed!"
4771	msgstr ""
4772
4773	+ #: front-end/recover.php:294
4774	msgid "The username entered wasn't found in the database!"
4775	msgstr ""
4776
4777	+ #: front-end/recover.php:294
4778	msgid "Please check that you entered the correct username."
4779	msgstr ""
4780
4781	+ #: front-end/recover.php:337
4782	msgid "The email address entered wasn't found in the database!"
4783	msgstr ""
4784
4785	+ #: front-end/recover.php:337
4786	msgid "Please check that you entered the correct email address."
4787	msgstr ""
4788
4789	+ #: front-end/recover.php:307
4790	msgid "Check your email for the confirmation link."
4791	msgstr ""
4792
4793	+ #: front-end/recover.php:321
4794	msgid "There was an error while trying to send the activation link to %1$s!"
4795	msgstr ""
4796
4797	+ #: front-end/recover.php:438
4798	msgid "ERROR:"
4799	msgstr ""
4800

5159	msgid "Approve User Link"
5160	msgstr ""
5161
5162	+ #: add-ons/email-customizer/email-customizer.php:55
5163	+ msgid "Unapprove User Url"
5164	+ msgstr ""
5165	+
5166	+ #: add-ons/email-customizer/email-customizer.php:56
5167	+ msgid "Unapprove User Link"
5168	+ msgstr ""
5169	+
5170	+ #: add-ons/email-customizer/email-customizer.php:60
5171	msgid "Approved Fields"
5172	msgstr ""
5173
5174	+ #: add-ons/email-customizer/email-customizer.php:61
5175	msgid "Unapproved Fields"
5176	msgstr ""
5177
5178	+ #: add-ons/email-customizer/email-customizer.php:65
5179	msgid "Modified Fields"
5180	msgstr ""
5181
5182	+ #: add-ons/email-customizer/email-customizer.php:66
5183	msgid "Approval URL"
5184	msgstr ""
5185
5186	+ #: add-ons/email-customizer/email-customizer.php:577
5187	msgid "The users selected password at signup"
5188	msgstr ""
5189
5190	+ #: add-ons/email-customizer/email-customizer.php:585, add-ons/email-customizer/email-customizer.php:592, add-ons/email-customizer/email-customizer.php:606, features/email-confirmation/email-confirmation.php:594
5191	msgid "Your selected password at signup"
5192	msgstr ""
5193

5996	msgid "User successfully deleted!"
5997	msgstr ""
5998
5999	+ #: features/admin-approval/admin-approval.php:90, features/admin-approval/admin-approval.php:386
6000	msgid "User successfully unapproved!"
6001	msgstr ""
6002
6003	+ #: features/admin-approval/admin-approval.php:80, features/admin-approval/admin-approval.php:370
6004	msgid "User successfully approved!"
6005	msgstr ""
6006

6048	msgid "Your account has been successfully created!"
6049	msgstr ""
6050
6051	+ #: features/admin-approval/admin-approval.php:325
6052	msgid "Something went wrong!"
6053	msgstr ""
6054
6055	+ #: features/admin-approval/admin-approval.php:321
6056	msgid "User not approved!"
6057	msgstr ""
6058
6059	+ #: features/admin-approval/admin-approval.php:304
6060	+ msgid "Do you wish to unapprove the registration?"
6061	+ msgstr ""
6062	+
6063	+ #: features/admin-approval/admin-approval.php:302
6064	msgid "Do you wish to approve the registration?"
6065	msgstr ""
6066
6067	+ #: features/admin-approval/admin-approval.php:346
6068	msgid "The approval link is not valid! Please <a href=\"%s\"> log in </a> to approve the user manually. "
6069	msgstr ""
6070

User registration & user profile – Profile Builder - Version 3.4.7

Version Description

Release Info

Code changes from version 3.4.6 to 3.4.7