1 files changed, 11 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
index 7a59d4f2f3..dce3c2fe88 100644
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ b/actionpack/lib/action_controller/railties/paths.rb
@@ -13,7 +13,17 @@ module ActionController
             end
 
             klass.helpers_path = paths
-            klass.helper :all if klass.superclass == ActionController::Base
+            if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
+              klass.helper :all
+            end
+
+            if app.config.serve_static_assets && namespace
+              paths = namespace._railtie.config.paths
+
+              klass.config.assets_dir      = paths["public"].first
+              klass.config.javascripts_dir = paths["public/javascripts"].first
+              klass.config.stylesheets_dir = paths["public/stylesheets"].first
+            end
           end
         end
       end