Fix cascade problem with site.baseurl. Fixes #931.
This commit is contained in:
parent
5fe31bcbca
commit
1526aa3b1d
|
@ -77,7 +77,6 @@ command :serve do |c|
|
||||||
c.action do |args, options|
|
c.action do |args, options|
|
||||||
options.default :port => '4000',
|
options.default :port => '4000',
|
||||||
:host => '0.0.0.0',
|
:host => '0.0.0.0',
|
||||||
:baseurl => '/',
|
|
||||||
:serving => true
|
:serving => true
|
||||||
|
|
||||||
options = normalize_options(options.__hash__)
|
options = normalize_options(options.__hash__)
|
||||||
|
|
|
@ -68,7 +68,7 @@ module Jekyll
|
||||||
|
|
||||||
'markdown' => 'maruku',
|
'markdown' => 'maruku',
|
||||||
'permalink' => 'date',
|
'permalink' => 'date',
|
||||||
'baseurl' => '',
|
'baseurl' => '/',
|
||||||
'include' => ['.htaccess'],
|
'include' => ['.htaccess'],
|
||||||
'paginate_path' => 'page:num',
|
'paginate_path' => 'page:num',
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue