Merge remote-tracking branch 'refs/remotes/origin/2.1'

# Conflicts:
#	com.woltlab.wcf/templates/register.tpl

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 3985962bc5284abd69005e8dff3e75cf58c7652c..7d1ec34efac6aba479ac3f062bd0aed0a310d57e 100644 (file)
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -203,10 +203,10 @@
                
                new WCF.User.Registration.Validation.EmailAddress($('#{@$randomFieldNames[email]}'), $('#{@$randomFieldNames[confirmEmail]}'), null);
                new WCF.User.Registration.Validation.Password($('#{@$randomFieldNames[password]}'), $('#{@$randomFieldNames[confirmPassword]}'), null);
-               new WCF.User.Registration.Validation.Username($('#{@$randomFieldNames[username]}', null, {
+               new WCF.User.Registration.Validation.Username($('#{@$randomFieldNames[username]}'), null, {
                        minlength: {@REGISTER_USERNAME_MIN_LENGTH},
                        maxlength: {@REGISTER_USERNAME_MAX_LENGTH}
-               }));
+               });
        });
 </script>