Permalink
Browse files

moved paginate_path to default config

  • Loading branch information...
1 parent 58d8fef commit 316cc8559c78cd3aac8683d301d2baaff6cf454f @daneharrigan daneharrigan committed Feb 27, 2012
Showing with 12 additions and 11 deletions.
  1. +11 −10 lib/jekyll.rb
  2. +1 −1 lib/jekyll/generators/pagination.rb
View
21 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',
View
2 lib/jekyll/generators/pagination.rb
@@ -47,7 +47,7 @@ def paginate(site, page)
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

0 comments on commit 316cc85

Please sign in to comment.