lets see if this fixes #1337

This commit is contained in:
Jonne Haß 2012-01-04 15:33:41 +01:00
parent 52c75a7ad4
commit 4a260056c0

View file

@ -6,6 +6,7 @@ require File.join(Rails.root, 'lib/messagebus/mailer')
Diaspora::Application.configure do
config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme,
:host => AppConfig[:pod_uri].authority }
config.action_mailer.asset_host = AppConfig[:pod_uri].to_s
unless Rails.env == 'test' || AppConfig[:mailer_on] != true
if AppConfig[:mailer_method] == 'messagebus'