diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 22:13:45 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 22:13:45 -0700 |
| commit | ab33b27947864d94be667db836e0ad7497575d13 (patch) | |
| tree | 4a2ae0afd8776fe7f2bfe8e5b3f35b472526bba5 /actionpack/lib/action_controller/rescue.rb | |
| parent | 6e3d2a7996f52bd0d7a5157f73a471307ba8aabd (diff) | |
| parent | 0096f5586987b720ca24c09103c9371f64ed26e5 (diff) | |
| download | rails-ab33b27947864d94be667db836e0ad7497575d13.tar.gz rails-ab33b27947864d94be667db836e0ad7497575d13.tar.bz2 rails-ab33b27947864d94be667db836e0ad7497575d13.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 482ac7d7a4..a1a9d68a35 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -182,7 +182,7 @@ module ActionController #:nodoc: @template.instance_variable_set("@rescues_path", File.dirname(rescues_path("stub"))) @template.send!(:assign_variables_from_controller) - @template.instance_variable_set("@contents", @template.render(:file => template_path_for_local_rescue(exception), :use_full_path => false)) + @template.instance_variable_set("@contents", @template.render(:file => template_path_for_local_rescue(exception))) response.content_type = Mime::HTML render_for_file(rescues_path("layout"), response_code_for_rescue(exception)) |