diff options
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 22292de40a6..df14cf34e85 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -199,11 +199,7 @@ class User < ActiveRecord::Base end def by_username_or_id(name_or_id) - if (name_or_id.is_a?(Integer)) - User.find_by_id(name_or_id) - else - User.find_by_username(name_or_id) - end + where('username = ? OR id = ?', name_or_id, name_or_id).first end def build_user(attrs = {}, options= {}) |