diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
| commit | aec7456f81985b88d6d604679d754636183b5b3a (patch) | |
| tree | 798fcab8ae0c6e2c8c5a63e1f39308ff4bb5a20c /actionpack/lib/action_view/renderer/abstract_renderer.rb | |
| parent | 1c2b2233c3a7ec76c0a0eddf5b8be45c489be133 (diff) | |
| parent | 70f9558d0e4b8e605576693cbb489caa5cf6a2bc (diff) | |
| download | rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.gz rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.bz2 rails-aec7456f81985b88d6d604679d754636183b5b3a.zip | |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Conflicts:
activesupport/lib/active_support/testing/performance.rb
Diffstat (limited to 'actionpack/lib/action_view/renderer/abstract_renderer.rb')
| -rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 4a52b3172e..60c527beeb 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -3,9 +3,8 @@ module ActionView delegate :find_template, :template_exists?, :with_fallbacks, :update_details, :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context - def initialize(view) - @view = view - @lookup_context = view.lookup_context + def initialize(lookup_context) + @lookup_context = lookup_context end def render |