提交 c396c5ab 编写于 作者: J Jeremy Kemper

Integration tests behave well with render_component. Closes #4632.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4582 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 cf965cda
*SVN* *SVN*
* Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com]
* Added exception handling of missing layouts #5373 [chris@ozmm.org] * Added exception handling of missing layouts #5373 [chris@ozmm.org]
* Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com] * Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
......
...@@ -332,9 +332,11 @@ module ClassMethods #:nodoc: ...@@ -332,9 +332,11 @@ module ClassMethods #:nodoc:
def clear_last_instantiation! def clear_last_instantiation!
self.last_instantiation = nil self.last_instantiation = nil
end end
def new_with_capture(*args) def new_with_capture(*args)
self.last_instantiation ||= new_without_capture(*args) controller = new_without_capture(*args)
self.last_instantiation ||= controller
controller
end end
end end
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册