From 36a68f5272e8d07b469991e3cfae1e463b472de6 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Fri, 11 Nov 2011 22:49:18 +0100 Subject: [PATCH] specify protocol for url helpers in action mailer --- config/initializers/mailer_config.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index c22d3815d..4e98dcbbf 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -4,7 +4,8 @@ require File.join(Rails.root, 'lib/messagebus/mailer') Diaspora::Application.configure do - config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].authority } + config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme, + :host => AppConfig[:pod_uri].authority } unless Rails.env == 'test' || AppConfig[:mailer_on] != true if AppConfig[:mailer_method] == 'messagebus'