From 223a71930007315a795f8d42de95e451480e1263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Mon, 2 Jan 2012 14:26:05 +0200
Subject: Use Refinery::Core.config to get site name.

---
 app/mailers/refinery/blog/comment_mailer.rb                  | 2 +-
 app/views/refinery/blog/comment_mailer/notification.html.erb | 2 +-
 app/views/refinery/blog/posts/index.rss.builder              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/mailers/refinery/blog/comment_mailer.rb b/app/mailers/refinery/blog/comment_mailer.rb
index 935ccf7..6f17f81 100644
--- a/app/mailers/refinery/blog/comment_mailer.rb
+++ b/app/mailers/refinery/blog/comment_mailer.rb
@@ -6,7 +6,7 @@ module Refinery
         @blog_comment = comment
         mail :subject => Blog::Comment::Notification.subject,
              :recipients => Blog::Comment::Notification.recipients,
-             :from => "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
+             :from => "\"#{Refinery::Core.config.site_name}\" <no-reply@#{request.domain}>"
       end
 
     end
diff --git a/app/views/refinery/blog/comment_mailer/notification.html.erb b/app/views/refinery/blog/comment_mailer/notification.html.erb
index 0c7dcd4..cfadb67 100644
--- a/app/views/refinery/blog/comment_mailer/notification.html.erb
+++ b/app/views/refinery/blog/comment_mailer/notification.html.erb
@@ -12,6 +12,6 @@
 <%=raw t('.comment_ends') %>
 
 <%=raw t('.closing_line') %>,
-<%=raw RefinerySetting[:site_name] %>
+<%=raw Refinery::Core.config.site_name %>
 
 <%=raw t('.ps') %>
diff --git a/app/views/refinery/blog/posts/index.rss.builder b/app/views/refinery/blog/posts/index.rss.builder
index 8cd89b7..609816a 100644
--- a/app/views/refinery/blog/posts/index.rss.builder
+++ b/app/views/refinery/blog/posts/index.rss.builder
@@ -1,8 +1,8 @@
 xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
   xml.channel do
-    xml.title ::Refinery::Setting.find_or_set(:site_name, "Company Name")
-    xml.description ::Refinery::Setting.find_or_set(:site_name, "Company Name") + " Blog Posts"
+    xml.title Refinery::Core.config.site_name
+    xml.description Refinery::Core.config.site_name + " Blog Posts"
     xml.link main_app.blog_root_url
 
     @blog_posts.each do |post|
-- 
cgit v1.2.3