aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-22 10:27:32 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-22 10:27:32 -0500
commitbc5896e708bf8070835bebe61de03b701fa5e6f7 (patch)
treee244324bec641c94eca09b25bb9decba0f4699c0 /actionpack/lib/action_controller
parent8a87d8a6c2c6dfb423bcaf61c750010d80993b16 (diff)
downloadrails-bc5896e708bf8070835bebe61de03b701fa5e6f7.tar.gz
rails-bc5896e708bf8070835bebe61de03b701fa5e6f7.tar.bz2
rails-bc5896e708bf8070835bebe61de03b701fa5e6f7.zip
Memoize ActionView::Base pick_template and find_partial_path for rendering duration
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 50727c67c4..4dabff637b 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1261,6 +1261,8 @@ module ActionController #:nodoc:
def template_exempt_from_layout?(template_name = default_template_name)
template_name = @template.pick_template(template_name).to_s if @template
@@exempt_from_layout.any? { |ext| template_name =~ ext }
+ rescue ActionView::MissingTemplate
+ false
end
def default_template_name(action_name = self.action_name)