Permalink
Browse files

Disabling automatic include for controllers to avoid class conflict

  • Loading branch information...
1 parent 2bfb6d8 commit 5acacbaa57a025db27eadcd48f39b8ec3b8b00c4 @bgkittrell committed Apr 11, 2012
Showing with 1 addition and 10 deletions.
  1. +0 −9 init.rb
  2. +1 −1 lib/open_flash_chart.rb
View
@@ -1,9 +0,0 @@
-require 'open_flash_chart'
-
-ActionView::Base.send :include, OpenFlashChart::View
-OpenFlashChart::Base.send :include, OpenFlashChart::View
-ActionController::Base.send :include, OpenFlashChart::Controller
-ActionController::Base.send :include, OpenFlashChart
-ActiveRecord::Base.send :include, OpenFlashChart::View
-ActiveRecord::Base.send :include, OpenFlashChart::Controller
-ActiveRecord::Base.send :include, OpenFlashChart
View
@@ -56,7 +56,7 @@
ActionView::Base.send :include, OpenFlashChart::View
OpenFlashChart::Base.send :include, OpenFlashChart::View
ActionController::Base.send :include, OpenFlashChart::Controller
-ActionController::Base.send :include, OpenFlashChart
+#ActionController::Base.send :include, OpenFlashChart
ActiveRecord::Base.send :include, OpenFlashChart::View
ActiveRecord::Base.send :include, OpenFlashChart::Controller
ActiveRecord::Base.send :include, OpenFlashChart

0 comments on commit 5acacba

Please sign in to comment.