Index: branches/5.2.x/core/install/install_data.sql =================================================================== diff -u -N -r14726 -r14728 --- branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14726) +++ branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14728) @@ -99,7 +99,7 @@ # Section "in-portal:configure_users": INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Allow_New', '3', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_users_allow_new', 'radio', '', '1=la_opt_UserInstantRegistration||2=la_opt_UserNotAllowedRegistration||3=la_opt_UserUponApprovalRegistration||4=la_opt_UserEmailActivation', 10.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AdvancedUserManagement', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_prompt_AdvancedUserManagement', 'checkbox', NULL, NULL, 10.011, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Email_As_Login', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 10.02, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RegistrationUsernameRequired', '1', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_RegistrationUsernameRequired', 'checkbox', NULL, NULL, 10.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Min_UserName', '3', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_text_min_username', 'text', '', 'style="width: 50px;"', 10.03, 1, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxUserName', '', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_text_min_username', 'text', '', 'style="width: 50px;"', 10.03, 2, 0, NULL); Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r14726 -r14728 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14726) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14728) @@ -1,6 +1,6 @@ PopulateStates($event, 'State', 'Country'); - if ( $this->Application->ConfigValue('Email_As_Login') ) { - $error_msgs = $object->GetFieldOption('Email', 'error_msgs'); - $error_msgs['unique'] = '!lu_user_and_email_already_exist!'; - $object->SetFieldOption('Email', 'error_msgs', $error_msgs); - } - $this->setUserGroup($object); $user_helper =& $this->Application->recallObject('UserHelper'); @@ -1457,7 +1451,7 @@ } } - if ( !$this->Application->ConfigValue('Email_As_Login') ) { + if ( $this->Application->ConfigValue('RegistrationUsernameRequired') ) { // Username becomes required only, when it's used in registration process $form_fields['Username']['required'] = 1; } Index: branches/5.2.x/core/kernel/managers/cache_manager.php =================================================================== diff -u -N -r14699 -r14728 --- branches/5.2.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 14699) +++ branches/5.2.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 14728) @@ -1,6 +1,6 @@