app/mailers/user_mailer.rb in tkh_authentication-0.1.3 vs app/mailers/user_mailer.rb in tkh_authentication-0.1.5

@@ -1,23 +1,15 @@
 class UserMailer < ActionMailer::Base
   
-  if defined?(SETTINGS) && SETTINGS['site_admin_email'] 
-    default :from => SETTINGS['site_admin_email']
-  else
-    default :from => '[e-mail]'
-  end
+  default :from => Setting.first.try(:contact_email) ? Setting.first.try(:contact_email) : '[e-mail]'
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
   #   en.user_mailer.password_reset.subject
   #
   def password_reset(user)  
     @user = user
-    if defined?(SETTINGS) && SETTINGS['site_name']
-      mail :to => user.email, :subject => t('authentication.password_reset_email_subject') + ' | ' + SETTINGS['site_name']
-    else
-      mail :to => user.email, :subject => t('authentication.password_reset_email_subject')
-    end
+    mail :to => user.email, :subject => t('authentication.password_reset_email_subject') + ' | ' + Setting.first.try(:site_name)
   end
 
 end
\ No newline at end of file