@@ -178,7 +178,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), false)) + @template.instance_variable_set("@contents", @template.render(:file=>template_path_for_local_rescue(exception), :use_full_path=>false)) response.content_type = Mime::HTML render_for_file(rescues_path("layout"), response_code_for_rescue(exception)) @@ -200,7 +200,6 @@ module ActionController #:nodoc: def perform_action_with_rescue #:nodoc: perform_action_without_rescue rescue Exception => exception - raise(exception) rescue_action_with_handler(exception) || rescue_action(exception) end actionpack/lib/action_controller/rescue.rb 50677ba5bc213ec96035ba4dee11ee3558725098 Ruy Asan ruyasan@gmail.com http://github.com/rubyruy/rails/commit/e3e684829775f13cd91920dd9eb3b0cd2fd97744 e3e684829775f13cd91920dd9eb3b0cd2fd97744 2008-09-08T16:14:44-07:00 2008-09-08T16:14:44-07:00 The *real* fix for error display in dev mode - backported from http://github.com/rails/rails/commit/ad772402c46a79c2d38979cef754b26dbd868196#diff-3 - this one doesn't cause double renderers during errors in production mode. e8ff1813b8ef7ff3563941ca786430dd599d8485 Ruy Asan ruyasan@gmail.com