diff --git a/History.txt b/History.txt index 180ba898..1fc6d2e2 100644 --- 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 index 4fb77397..9bdafa16 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -18,17 +18,7 @@ module Jekyll 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