Skip to content

Fix: avoid unintended @@skip_touch_context persistence when @skip_touch_context is true #2486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knaito-asial wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

Fix: avoid unintended @@skip_touch_context persistence when @skip_touch_context is true #2486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config/initializers/active_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,9 @@ def save_without_touching_context
end

def touch_context
return if @@skip_touch_context ||= false || @skip_touch_context ||= false
skip1 = defined?(@@skip_touch_context) ? @@skip_touch_context : false
skip2 = @skip_touch_context.nil? ? false : @skip_touch_context
return if skip1 || skip2

self.class.connection.after_transaction_commit do
if respond_to?(:context_type) && respond_to?(:context_id) && context_type && context_id
Expand Down