diff options
| author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
| commit | 790c062280c0d23c2033e4983c13d402c0424f2a (patch) | |
| tree | 7b652b420411779072c2371a42e84c83525f63b1 /actionpack/lib | |
| parent | 51fe6d05e73a4e0f8481f4e441f4ca886d65a69c (diff) | |
| parent | 303991288633effea5a1d1774dbd861951303fe5 (diff) | |
| download | rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.gz rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.bz2 rails-790c062280c0d23c2033e4983c13d402c0424f2a.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 9314ff5c53..c24b404e2f 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -167,7 +167,7 @@ module ActionDispatch @env["action_dispatch.request.formats"] ||= if parameters[:format] - [Mime[parameters[:format]]] + Array.wrap(Mime[parameters[:format]]) elsif xhr? || (accept && !accept.include?(?,)) accepts else diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 8beda24aba..86bbad822d 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -120,6 +120,7 @@ module ActionView def _view view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller) view.class.send :include, _helpers + view.output_buffer = self.output_buffer view end |