diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index d9d86e9d6..41d76e925 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -38,7 +38,6 @@ class Poll::Answer < ApplicationRecord def max_votes return if !question || question&.unique? || persisted? - author.reload author.lock! if question.answers.by_author(author).count >= question.max_votes diff --git a/app/models/user.rb b/app/models/user.rb index d19072fe5..6a400c5bc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -339,7 +339,7 @@ class User < ApplicationRecord end def locale - self[:locale] ||= I18n.default_locale.to_s + self[:locale] || I18n.default_locale.to_s end def confirmation_required?