From 1aadafda8dd28ec081da6827878003c478c77c76 Mon Sep 17 00:00:00 2001 From: Yehuda Katz and Carl Lerche Date: Wed, 8 Apr 2009 17:32:19 -0700 Subject: Updated old AC::Base for small changes to AV --- actionpack/lib/action_controller/base/base.rb | 2 +- actionpack/lib/action_controller/dispatch/dispatcher.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb index 29d87d8125..7a745ea040 100644 --- a/actionpack/lib/action_controller/base/base.rb +++ b/actionpack/lib/action_controller/base/base.rb @@ -832,7 +832,7 @@ module ActionController #:nodoc: begin default_render rescue ActionView::MissingTemplate => e - raise e unless e.path == action_name + raise e unless e.action_name == action_name # If the path is the same as the action_name, the action is completely missing raise UnknownAction, "No action responded to #{action_name}. Actions: " + "#{action_methods.sort.to_sentence}", caller diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index df77e22204..e205245f13 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -64,7 +64,6 @@ module ActionController run_callbacks :before_dispatch Routing::Routes.call(@env) rescue Exception => exception - raise exception if controller ||= (::ApplicationController rescue Base) controller.call_with_exception(@env, exception).to_a else -- cgit v1.2.3