From b97b426d34e86e3ec46ccb7159ba80f4f438f67b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 11 Jul 2018 09:26:43 +1000 Subject: [PATCH] Revert "FIX: wrong site origin in message bus header" This reverts commit 93b49a0dd53fd1edbe69a37b36ce3c82ef132765. --- config/initializers/004-message_bus.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb index 3ad639ffded..137dff182c5 100644 --- a/config/initializers/004-message_bus.rb +++ b/config/initializers/004-message_bus.rb @@ -10,14 +10,14 @@ end def setup_message_bus_env(env) return if env["__mb"] + extra_headers = { + "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix, + "Access-Control-Allow-Methods" => "GET, POST", + "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible" + } + host = RailsMultisite::ConnectionManagement.host(env) RailsMultisite::ConnectionManagement.with_hostname(host) do - extra_headers = { - "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix, - "Access-Control-Allow-Methods" => "GET, POST", - "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible" - } - user = nil begin user = CurrentUser.lookup_from_env(env)