To avoid reloading issues since injecting into ApplicationController …

…means that we loose functionality once this class is reloaded while in development. For now default to previous behavior to avoid epic fails (this could be solved using config.to_prepare in init.rb)
kete · Jan 20, 2010 · dbaae89 · dbaae89 · miclle · Feb 26, 2010
1 parent ac601ec
commit dbaae89
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/tiny_mce.rb b/lib/tiny_mce.rb
@@ -72,7 +72,7 @@ module Base
 # Include the TinyMCE methods and TinyMCE Helpers into ActionController::Base
 
 if defined?(Rails) && defined?(ActionController)
-  ApplicationController.send(:include, TinyMCE::Base)
-  ApplicationController.send(:helper, TinyMCE::Helpers)
+  ActionController::Base.send(:include, TinyMCE::Base)
+  ActionController::Base.send(:helper, TinyMCE::Helpers)
   TinyMCE.install_or_update_tinymce
 end