diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 9c8216522ce..a11b1bc7a8f 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -594,7 +594,7 @@ class SessionController < ApplicationController client_ip: request&.ip, user_agent: request&.user_agent, } - DiscourseEvent.trigger(:before_session_destroy, event_data) + DiscourseEvent.trigger(:before_session_destroy, event_data, **Discourse::Utils::EMPTY_KEYWORDS) redirect_url = event_data[:redirect_url] reset_session diff --git a/lib/discourse.rb b/lib/discourse.rb index acb8d2060d5..577ae781008 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -12,6 +12,9 @@ module Discourse class Utils URI_REGEXP ||= URI.regexp(%w[http https]) + # TODO: Remove this once we drop support for Ruby 2. + EMPTY_KEYWORDS ||= {} + # Usage: # Discourse::Utils.execute_command("pwd", chdir: 'mydirectory') # or with a block