Merge pull request #1443 from hagenburger/allow-custom-option

don’t override :custom if already set
This commit is contained in:
Thomas Reynolds 2015-02-10 07:14:15 -08:00
commit 04da75a2eb

View file

@ -105,7 +105,7 @@ module Middleman
filename: eval_file, filename: eval_file,
line: line, line: line,
syntax: syntax, syntax: syntax,
custom: { middleman_context: ctx.app } custom: (options[:custom] || {}).merge(middleman_context: ctx.app)
} }
if ctx.is_a?(::Middleman::TemplateContext) && file if ctx.is_a?(::Middleman::TemplateContext) && file