diff options
| author | Alec Leamas <leamas.alec@gmail.com> | 2010-12-10 14:54:02 +0300 |
|---|---|---|
| committer | Alec Leamas <leamas.elac@nospam.net> | 2010-12-10 16:29:19 +0300 |
| commit | eacee54846818bb159302aababcc0e89af58bb55 (patch) | |
| tree | 4a49e176d58f13aeeee0666b2070a19eb4abb898 /config/initializers/mailer_config.rb | |
| parent | 416a36ea9a035dc5cf897ad471eb26fb6b518405 (diff) | |
Replace APP_CONFIG[:terse_pod_url] with uri object.
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
Diffstat (limited to 'config/initializers/mailer_config.rb')
| -rw-r--r-- | config/initializers/mailer_config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index 25cd82ce5..c91a99f3d 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. Diaspora::Application.configure do - config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]} + config.action_mailer.default_url_options = {:host => APP_CONFIG[:pod_uri].host} unless Rails.env == 'test' || APP_CONFIG[:mailer_on] != true config.action_mailer.delivery_method = :smtp if APP_CONFIG[:smtp_authentication] == "none" |