Partially revert 4e89d3f778.

* SiteSetting uses DistributedCache which depends on MessageBus. Therefore, we need to initialize MessageBus first.
2017-10-12 15:13:11 +08:00 · 2017-10-12 15:13:11 +08:00 · d2ac7a9476
parent 23415caecd
commit d2ac7a9476
3 changed files with 3 additions and 3 deletions
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
--- a/config/initializers/005-site_settings.rb
+++ b/config/initializers/005-site_settings.rb
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@ -295,11 +295,11 @@ module SiteSettingExtension
    clean_name = name.to_s.sub("?", "").to_sym

    define_singleton_method clean_name do
-      if (c = @containers[provider.current_site])
-        c[name]
-      else
+      if (c = current[name]).nil?
        refresh!
        current[name]
+      else
+        c
      end
    end