Merge pull request #323 from AngelFQC/7179

Solves Bug#7179
11 years ago · 806201e2cf
parent 4e9576de78 911b2ace03
commit 806201e2cf
1 changed files with 3 additions and 1 deletions
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@ -155,7 +155,9 @@ if (api_get_setting('profile', 'login') !== 'true') {
 $form->applyFilter('username', 'stripslashes');
 $form->applyFilter('username', 'trim');
 $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
-$form->addRule('username', get_lang('UsernameWrong'), 'username');
+if (api_get_setting('login_is_email') != 'true'){
+    $form->addRule('username', get_lang('UsernameWrong'), 'username');
+}
 $form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']);

 //    OFFICIAL CODE