Shorten plugin loading code and update history.

JangoSteve · Jan 29, 2012 · 4499df8 · 4499df8
1 parent 02366ae
commit 4499df8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/History.txt b/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)

diff --git a/lib/jekyll/site.rb b/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