aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-09-03 11:01:24 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:16 +0200
commit89bd715f6be4235ac7632de10349e9939be04e75 (patch)
tree9aa3edaaf4761ead80276d4cb6722a63732c9f45
parentffa2acad5cee6b8c09ac95e973668d6d1a6b31e0 (diff)
downloadrails-89bd715f6be4235ac7632de10349e9939be04e75.tar.gz
rails-89bd715f6be4235ac7632de10349e9939be04e75.tar.bz2
rails-89bd715f6be4235ac7632de10349e9939be04e75.zip
Forgot to move that line to railtie on rebase
-rw-r--r--actionpack/lib/action_controller/railties/paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
index e1b318b566..fa71d55946 100644
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ b/actionpack/lib/action_controller/railties/paths.rb
@@ -11,7 +11,7 @@ module ActionController
klass.helpers_path = app.config.helpers_paths
end
- klass.helper :all
+ klass.helper :all if klass.superclass == ActionController::Base
end
end
end