Changeset 1231

Show
Ignore:
Timestamp:
07/23/08 10:50:01 (4 months ago)
Author:
alban
Message:

Fixe LiquidView#render? (qui demande un deuxieme argument ?). Refs #6

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/vendor/plugins/liquid/lib/extras/liquid_view.rb

    r1227 r1231  
    33# 
    44# Example 
    5 #  
     5# 
    66#   ActionView::Base::register_template_handler :liquid, LiquidView 
    77class LiquidView 
    …… 
    1010    @action_view = action_view 
    1111  end 
    12    
    1312 
    14   def render(template, local_assigns) 
     13 
     14  def render(template, local_assigns = {}) 
    1515    @action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8' 
    1616    assigns = @action_view.assigns.dup 
    17      
     17 
    1818    if content_for_layout = @action_view.instance_variable_get("@content_for_layout") 
    1919      assigns['content_for_layout'] = content_for_layout 
    2020    end 
    2121    assigns.merge!(local_assigns) 
    22      
     22 
    2323    liquid = Liquid::Template.parse(template) 
    2424    liquid.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller})