Merge pull request #3592 from Xenograph/master

FIX: Substrings of reserved usernames no longer treated as reserved
2015-07-07 11:41:36 -04:00 · 2015-07-07 11:41:36 -04:00 · 0330e17ffa
parent 6ba6a59552 5e615ef26e
commit 0330e17ffa
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -231,7 +231,7 @@ class UsersController < ApplicationController
      return fail_with("login.password_too_long")
    end

-    if SiteSetting.reserved_usernames.include? params[:username].downcase
+    if SiteSetting.reserved_usernames.split("|").include? params[:username].downcase
      return fail_with("login.reserved_username")
    end