aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-21 07:14:35 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-21 07:14:35 +0000
commitbd558ef98e17e27da51aee77fe50ef2cd129bb6e (patch)
treea421c2489f33167c4e3157c288c2d42367374a11 /actionpack/lib/action_controller/base.rb
parentd886ad5c8b6f9eaa8b82e634c989aee48ccaf240 (diff)
downloadrails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.tar.gz
rails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.tar.bz2
rails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.zip
Improved rendering speed on complicated templates by up to 25% #1234 [Stephan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1874 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ac733c1d36..d19990d155 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -596,6 +596,7 @@ module ActionController #:nodoc:
@template.render_template(
options[:type] || :rhtml,
options[:inline],
+ nil,
options[:locals] || {}
)
}))