mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Simpler rescue_action condition
This commit is contained in:
parent
f2e4bf218f
commit
cde6a259bf
1 changed files with 2 additions and 4 deletions
|
@ -199,10 +199,8 @@ module ActionController #:nodoc:
|
||||||
private
|
private
|
||||||
def perform_action_with_rescue #:nodoc:
|
def perform_action_with_rescue #:nodoc:
|
||||||
perform_action_without_rescue
|
perform_action_without_rescue
|
||||||
rescue Exception => exception # errors from action performed
|
rescue Exception => exception
|
||||||
return if rescue_action_with_handler(exception)
|
rescue_action_with_handler(exception) || rescue_action(exception)
|
||||||
|
|
||||||
rescue_action(exception)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def rescues_path(template_name)
|
def rescues_path(template_name)
|
||||||
|
|
Loading…
Reference in a new issue