Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/lib/active_record/associations.rb
	activerecord/test/cases/associations/cascaded_eager_loading_test.rb

1 files changed, 4 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
index fa71d55946..7a59d4f2f3 100644
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ b/actionpack/lib/action_controller/railties/paths.rb
@@ -5,12 +5,14 @@ module ActionController
         Module.new do
           define_method(:inherited) do |klass|
             super(klass)
+
             if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              klass.helpers_path = namespace._railtie.config.paths.app.helpers.to_a
+              paths = namespace._railtie.paths["app/helpers"].existent
             else
-              klass.helpers_path = app.config.helpers_paths
+              paths = app.config.helpers_paths
             end
 
+            klass.helpers_path = paths
             klass.helper :all if klass.superclass == ActionController::Base
           end
         end