Permalink
Browse files

Merge pull request #18 from kszksz/rails_3_1_patch

Rails 3.1 fixes
  • Loading branch information...
2 parents ccc3c39 + 1a070bb commit 31557ddb8f27221dd024f8b34266f40c77cf24de Sandip Ransing committed Jan 22, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 config/routes.rb
  2. +2 −2 lib/tiny_mce_helper.rb
View
@@ -1,4 +1,4 @@
-ActionController::Routing::Routes.draw do
+Rails.application.routes.draw do
resources :attachments do
collection do
get :manage
View
@@ -39,10 +39,10 @@ def tiny_mce_init(options = @tiny_mce_options)
alias tiny_mce tiny_mce_init
def javascript_include_tiny_mce
- javascript_include_tag RAILS_ENV == 'development' ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce"
+ javascript_include_tag Rails.env == 'development' ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce"
end
def javascript_include_tiny_mce_if_used
javascript_include_tiny_mce if @uses_tiny_mce
end
-end
+end

0 comments on commit 31557dd

Please sign in to comment.