@@ -11,16 +11,25 @@ class LiquidView end - def render(template, local_assigns) + def render(template, local_assigns_for_rails_less_than_2_1_0 = nil) @action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8' assigns = @action_view.assigns.dup + # template is a Template object in Rails >=2.1.0, a source string previously. + if template.respond_to? :source + source = template.source + local_assigns = template.locals + else + source = template + local_assigns = local_assigns_for_rails_less_than_2_1_0 + end + if content_for_layout = @action_view.instance_variable_get("@content_for_layout") assigns['content_for_layout'] = content_for_layout end assigns.merge!(local_assigns) - liquid = Liquid::Template.parse(template) + liquid = Liquid::Template.parse(source) liquid.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller}) end lib/extras/liquid_view.rb 24bf446b0e789865370bfe248c2cfe44602afd61 Michael Klett michael@webadvocate.com http://github.com/tobi/liquid/commit/3bfde37a53edc8502052696e53fde3758686b718 3bfde37a53edc8502052696e53fde3758686b718 2008-09-22T06:48:15-07:00 2008-09-22T06:48:15-07:00 Enable rails 2.1.x compaitibility by allowing the render method to accept an ActionView::Template object. This seems to complete the earlier 'ugly hack' for rails 2.1.x compatibility 9bb3ab7c5b58c09617ca4fa90ecb66dcefe62f3a Michael Klett michael@webadvocate.com