Browse files

Revert "Use ENV vars directly rather than through CONFIG hash"

This reverts commit ee9ba5f.
  • Loading branch information...
1 parent ee9ba5f commit 004c35ae09d9b0bbe8122ba9cd4f99f6c85f642e @adrianshort committed Oct 24, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 themes/sutton/views/layouts/application.html.haml
View
4 themes/sutton/views/layouts/application.html.haml
@@ -1,7 +1,7 @@
!!!5
%html
%head
- %title= @page_title.nil? ? ENV['BOOKSHARE_SITENAME'] : @page_title + " - " + ENV['BOOKSHARE_SITENAME']
+ %title= @page_title.nil? ? CONFIG[:sitename] : @page_title + " - " + CONFIG[:sitename]
%link{ :rel => 'shortcut icon', :href => theme_image_path('favicon.ico'), :type => 'image/x-icon' }
%link{ :rel => 'apple-touch-icon', :href => theme_image_path('apple-touch-icon.png') }
= theme_stylesheet_link_tag :style
@@ -93,7 +93,7 @@
- unless CONFIG[:google_analytics].nil?
:javascript
var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '#{ENV["BOOKSHARE_GOOGLE_ANALYTICS"]}']);
+ _gaq.push(['_setAccount', '#{CONFIG[:google_analytics]}']);
_gaq.push(['_trackPageview']);
(function() {

0 comments on commit 004c35a

Please sign in to comment.