Install named routes into ActionView::Base instead of proxying them t…

…o the view via helper_method. Closes #5932.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5283 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Install named routes into ActionView::Base instead of proxying them to the view via helper_method. Closes #5932. [Nicholas Seckar]
+
 * Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
 
 * Fix relative URL root matching problems. [Mark Imbriaco]
@@ -8,6 +10,7 @@
 
 * render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).  [Jeremy Kemper]
 
+>>>>>>> .r5282
 * Rename test assertion to prevent shadowing. Closes #6306. [psross]
 
 * Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [phallstrom]

actionpack/lib/action_controller/routing.rb

@@ -1025,11 +1025,8 @@ def length
           routes.length
         end
 
-        def install(dest = ActionController::Base)
-          dest.send :include, @module
-          if dest.respond_to? :helper_method
-            helpers.each { |name| dest.send :helper_method, name }
-          end
+        def install(destinations = [ActionController::Base, ActionView::Base])
+          Array(destinations).each { |dest| dest.send :include, @module }
         end
 
         private