merge upstream

iffyuva · May 14, 2013 · 47a336b · 47a336b
1 parent 3cdfd27
commit 47a336b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/social_buttons.rb b/lib/social_buttons.rb
@@ -26,4 +26,4 @@ def self.config name = nil, &block
 end
 
 require "social_buttons/view_helper"
-require "social_buttons/engine" if defined?(::Rails::Engine)
+require "social_buttons/railtie" if defined?(Rails)
diff --git a/lib/social_buttons/railtie.rb b/lib/social_buttons/railtie.rb
@@ -0,0 +1,7 @@
+module SocialButtons
+  class Railtie < ::Rails::Railtie
+    initializer 'social buttons config' do
+      ActionView::Base.send :include, ViewHelper
+    end
+  end
+end