dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten plugin loading code and update history.

This commit is contained in:
Tom Preston-Werner 2012-01-29 12:49:57 -08:00
parent 02366ae5ff
commit 4499df8033
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.txt
View File

@ -4,6 +4,7 @@
* Add --default-mimetype option (#279) * Add --default-mimetype option (#279)
* Allow setting of RedCloth options (#284) * Allow setting of RedCloth options (#284)
* Add post_url Liquid tag for internal post linking (#369) * Add post_url Liquid tag for internal post linking (#369)
* Allow multiple plugin dirs to be specified (#438)
* Bug Fixes * Bug Fixes
* Allow some special characters in highlight names * Allow some special characters in highlight names
* URL escape category names in URL generation (#360) * URL escape category names in URL generation (#360)

12
lib/jekyll/site.rb
View File

@ -18,17 +18,7 @@ module Jekyll
self.safe = config['safe'] self.safe = config['safe']
self.source = File.expand_path(config['source']) self.source = File.expand_path(config['source'])
self.dest = File.expand_path(config['destination']) self.dest = File.expand_path(config['destination'])
self.plugins = if config['plugins'].respond_to?('each') self.plugins = Array(config['plugins']).map { |d| File.expand_path(d) }
# If plugins is an array, process it.
Array(config['plugins']).map { |d| File.expand_path(d) }
else
if config['plugins'].nil?
[]
else
# Otherwise process a single entry as an array.
[File.expand_path(config['plugins'])]
end
end
self.lsi = config['lsi'] self.lsi = config['lsi']
self.pygments = config['pygments'] self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym self.permalink_style = config['permalink'].to_sym