deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Attempt fix for #1506

Browse source
This commit is contained in:
Thomas Reynolds 2015-05-07 09:01:04 -07:00
parent 588f42f1df
commit 70dd18e8f1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -300,7 +300,7 @@ module Middleman
end end
# Render using Tilt # Render using Tilt
content = template.render(context, locs, &block) content = template.render(context || ::Object.new, locs, &block)
# Allow hooks to manipulate the result after render # Allow hooks to manipulate the result after render
self.class.callbacks_for_hook(:after_render).each do |callback| self.class.callbacks_for_hook(:after_render).each do |callback|

2
middleman-core/lib/middleman-core/meta_pages.rb
View file

@ -90,7 +90,7 @@ module Middleman
# Render a template with the given name and locals # Render a template with the given name and locals
def template(template_name, locals={}) def template(template_name, locals={})
template_path = File.join(File.dirname(__FILE__), 'meta_pages', 'templates', template_name) template_path = File.join(File.dirname(__FILE__), 'meta_pages', 'templates', template_name)
content = Tilt.new(template_path).render(nil, locals) content = Tilt.new(template_path).render(::Object.new, locals)
response(content) response(content)
end end