Browse files

Shorten plugin loading code and update history.

  • Loading branch information...
1 parent 02366ae commit 4499df80330ac70f9ac09f854941394542019b6a @mojombo mojombo committed Jan 29, 2012
Showing with 2 additions and 11 deletions.
  1. +1 −0 History.txt
  2. +1 −11 lib/jekyll/site.rb
View
1 History.txt
@@ -4,6 +4,7 @@
* Add --default-mimetype option (#279)
* Allow setting of RedCloth options (#284)
* Add post_url Liquid tag for internal post linking (#369)
+ * Allow multiple plugin dirs to be specified (#438)
* Bug Fixes
* Allow some special characters in highlight names
* URL escape category names in URL generation (#360)
View
12 lib/jekyll/site.rb
@@ -18,17 +18,7 @@ def initialize(config)
self.safe = config['safe']
self.source = File.expand_path(config['source'])
self.dest = File.expand_path(config['destination'])
- self.plugins = if config['plugins'].respond_to?('each')
- # 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.plugins = Array(config['plugins']).map { |d| File.expand_path(d) }
self.lsi = config['lsi']
self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym

0 comments on commit 4499df8

Please sign in to comment.