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

First fix to actually use the encoding option again

Browse source
This commit is contained in:
Ulrich Gabor 2016-01-05 15:11:14 +01:00
parent 1ca5be7b19
commit 298b3909ed
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
middleman-core/lib/middleman-core/application.rb
View file

@ -253,11 +253,6 @@ module Middleman
# Initialize the Sitemap # Initialize the Sitemap
@sitemap = ::Middleman::Sitemap::Store.new(self) @sitemap = ::Middleman::Sitemap::Store.new(self)
if Object.const_defined?(:Encoding)
Encoding.default_internal = config[:encoding]
Encoding.default_external = config[:encoding]
end
::Middleman::Extension.clear_after_extension_callbacks ::Middleman::Extension.clear_after_extension_callbacks
after_configuration_eval(&method(:prune_tilt_templates)) after_configuration_eval(&method(:prune_tilt_templates))
@ -276,6 +271,10 @@ module Middleman
# Eval config. # Eval config.
evaluate_configuration! evaluate_configuration!
if Object.const_defined?(:Encoding)
Encoding.default_external = config[:encoding]
end
# Run any `configure` blocks for the current environment. # Run any `configure` blocks for the current environment.
execute_callbacks([:configure, config[:environment]]) execute_callbacks([:configure, config[:environment]])