diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-28 17:10:52 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-28 17:10:52 +0100 |
| commit | 1df157cd38c9246a87f0643f78be7f8fdb5bb474 (patch) | |
| tree | 8b3d41f021a743c0697ea790e8f9b70cf26c793c /actionpack/lib/action_controller | |
| parent | 3e54a9a689915c28bc806498e5d1d1af91255fb0 (diff) | |
| parent | ac50ee0edfa0df90ae7a8dd09f4a41ecbd1c7a94 (diff) | |
| download | rails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.tar.gz rails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.tar.bz2 rails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/routing/recognition_optimisation.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/routing/recognition_optimisation.rb b/actionpack/lib/action_controller/routing/recognition_optimisation.rb index 4935432d87..6c47ced6d1 100644 --- a/actionpack/lib/action_controller/routing/recognition_optimisation.rb +++ b/actionpack/lib/action_controller/routing/recognition_optimisation.rb @@ -153,13 +153,7 @@ module ActionController def clear_recognize_optimized! remove_recognize_optimized! - - class << self - def recognize_optimized(path, environment) - write_recognize_optimized! - recognize_optimized(path, environment) - end - end + write_recognize_optimized! end def remove_recognize_optimized! diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index f84c48f102..7a31f0e8d5 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -218,7 +218,7 @@ module ActionController #:nodoc: # Returns the template of the file which was used to # render this response (or nil) def rendered_template - template.send(:_first_render) + template.instance_variable_get(:@_first_render) end # A shortcut to the flash. Returns an empty hash if no session flash exists. |