Skip to content

Commit

Permalink
In new base Rails2Compatibility, move @template assignment to right b…
Browse files Browse the repository at this point in the history
…efore the first action is processed.
  • Loading branch information
Carl Lerche committed May 26, 2009
1 parent cd8fb18 commit cbb0724
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions actionpack/lib/action_controller/new_base/compatibility.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ def assign_shortcuts(*) end


# TODO: Remove this after we flip # TODO: Remove this after we flip
def template def template
_action_view @template ||= _action_view
end

def process_action(*)
template
super
end end


module ClassMethods module ClassMethods
Expand All @@ -83,11 +88,6 @@ def cache_store=(store_option)
@@cache_store = ActiveSupport::Cache.lookup_store(store_option) @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
end end
end end

def initialize(*)
super
@template = _action_view
end


def render_to_body(options) def render_to_body(options)
if options.is_a?(Hash) && options.key?(:template) if options.is_a?(Hash) && options.key?(:template)
Expand Down

0 comments on commit cbb0724

Please sign in to comment.