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

Activate Sprockets before user config

Browse source
This commit is contained in:
Ben Hollis 2013-04-07 23:33:40 -07:00
parent b159946a6e
commit 1617875934
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
middleman-core/lib/middleman-core/core_extensions/extensions.rb
View file

@ -128,13 +128,6 @@ module Middleman
# Search the root of the project for required files # Search the root of the project for required files
$LOAD_PATH.unshift(root) $LOAD_PATH.unshift(root)
# Check for and evaluate local configuration
local_config = File.join(root, "config.rb")
if File.exists? local_config
logger.debug "== Reading: Local config"
instance_eval File.read(local_config), local_config, 1
end
if config[:autoload_sprockets] if config[:autoload_sprockets]
begin begin
require "middleman-sprockets" require "middleman-sprockets"
@ -143,6 +136,13 @@ module Middleman
end end
end end
# Check for and evaluate local configuration
local_config = File.join(root, "config.rb")
if File.exists? local_config
logger.debug "== Reading: Local config"
instance_eval File.read(local_config), local_config, 1
end
run_hook :build_config if build? run_hook :build_config if build?
run_hook :development_config if development? run_hook :development_config if development?