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

don’t override :custom if already set
2015-02-10 07:14:15 -08:00 · 2015-02-10 07:14:15 -08:00 · 04da75a2eb
commit 04da75a2eb
parent e4b7d4fff0 98b06878a5
1 changed files with 1 additions and 1 deletions
--- a/middleman-core/lib/middleman-core/renderers/sass.rb
+++ b/middleman-core/lib/middleman-core/renderers/sass.rb
@ -105,7 +105,7 @@ module Middleman
            filename: eval_file,
            line: line,
            syntax: syntax,
-            custom: { middleman_context: ctx.app }
+            custom: (options[:custom] || {}).merge(middleman_context: ctx.app)
          }

          if ctx.is_a?(::Middleman::TemplateContext) && file