Allow username or email in login form

diff --git a/lib/nickname.php b/lib/nickname.php
index e21517497a18cd0587530bc14519fb9ebf310ff5..cdceaef726a5f4bfbbb7cfaa0225afede46f359d 100644 (file)
--- a/lib/nickname.php
+++ b/lib/nickname.php
@@ -141,7 +141,7 @@ class Nickname
 
         if (mb_strlen($str) < 1) {
             throw new NicknameEmptyException();
-        } elseif (!self::isCanonical($str)) {
+        } elseif (!self::isCanonical($str) && !filter_var($str, FILTER_VALIDATE_EMAIL)) {
             throw new NicknameInvalidException();
         } elseif (self::isBlacklisted($str)) {
             throw new NicknameBlacklistedException();