From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Mar 2011 22:19:35 +0000 (+0000)
Subject: Cope with MESSAGES_DOMAIN not being defined
X-Git-Tag: live~6133
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f8ace8f9e063861d66558f43b936c92ae85a0e96

Cope with MESSAGES_DOMAIN not being defined
---

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 059377639..03923e9e7 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -116,7 +116,7 @@ class Notifier < ActionMailer::Base
 private
 
   def from_address(name, type, id, digest)
-    if domain = MESSAGES_DOMAIN
+    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
       "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
     else
       EMAIL_FROM