Permalink
Browse files

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
  • Loading branch information...
1 parent 1117387 commit 214d236e7d9967a887fecee6e24d4c96c4a344dc @seckar seckar committed Oct 11, 2006
Showing with 5 additions and 5 deletions.
  1. +3 −0 actionpack/CHANGELOG
  2. +2 −5 actionpack/lib/action_controller/routing.rb
View
@@ -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]
@@ -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

0 comments on commit 214d236

Please sign in to comment.