diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 36642a26..b434ea29 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -51,21 +51,22 @@ module Jekyll # Default options. Overriden by values in _config.yml or command-line opts. # (Strings rather symbols used for compatability with YAML). DEFAULTS = { - 'safe' => false, - 'auto' => false, - 'server' => false, - 'server_port' => 4000, + 'safe' => false, + 'auto' => false, + 'server' => false, + 'server_port' => 4000, 'source' => Dir.pwd, 'destination' => File.join(Dir.pwd, '_site'), 'plugins' => File.join(Dir.pwd, '_plugins'), - 'future' => true, - 'lsi' => false, - 'pygments' => false, - 'markdown' => 'maruku', - 'permalink' => 'date', - + 'future' => true, + 'lsi' => false, + 'pygments' => false, + 'markdown' => 'maruku', + 'permalink' => 'date', + 'paginate_path' => 'page:num', + 'markdown_ext' => 'markdown,mkd,mkdn,md', 'textile_ext' => 'textile', diff --git a/lib/jekyll/generators/pagination.rb b/lib/jekyll/generators/pagination.rb index 6fb8a3a5..dee5ad54 100644 --- a/lib/jekyll/generators/pagination.rb +++ b/lib/jekyll/generators/pagination.rb @@ -47,7 +47,7 @@ module Jekyll private def paginate_path(site, num_page) - format = site.config['paginate_path'] || "page:num" + format = site.config['paginate_path'] format.sub(':num', num_page.to_s) end end