app/mailers/locomotive/notifications.rb in locomotive_cms-2.0.0.rc12 vs app/mailers/locomotive/notifications.rb in locomotive_cms-2.0.0

- old
+ new

@@ -2,10 +2,16 @@ class Notifications < ActionMailer::Base default :from => Locomotive.config.mailer_sender def new_content_entry(account, entry) - @account, @entry, @type, @domain = account, entry, entry.content_type, entry.site.domains.first + @account, @entry, @type = account, entry, entry.content_type + + if Locomotive.config.multi_sites_or_manage_domains? + @domain = entry.site.domains.first + else + @domain = ActionMailer::Base.default_url_options[:host] || 'localhost' + end subject = t('locomotive.notifications.new_content_entry.subject', :domain => @domain, :type => @type.name, :locale => account.locale) mail :subject => subject, :to => account.email end \ No newline at end of file