aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/middleware_stack.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-01-14 15:36:27 +0000
commitdeb597d63db0c903ce0ff70ab53abed60f95192a (patch)
tree52cd072f2e666baa0286aea741c365d7cb30f42f /actionpack/lib/action_controller/middleware_stack.rb
parente46c80765525817a89b784e6336a9f66250d53fc (diff)
parent9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a (diff)
downloadrails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.gz
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.tar.bz2
rails-deb597d63db0c903ce0ff70ab53abed60f95192a.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/middleware_stack.rb')
-rw-r--r--actionpack/lib/action_controller/middleware_stack.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/middleware_stack.rb b/actionpack/lib/action_controller/middleware_stack.rb
index 2bccba2ba1..b94bf6ec4a 100644
--- a/actionpack/lib/action_controller/middleware_stack.rb
+++ b/actionpack/lib/action_controller/middleware_stack.rb
@@ -32,6 +32,8 @@ module ActionController
else
@klass.to_s.constantize
end
+ rescue NameError
+ @klass
end
def active?