lib/octopress/docs.rb in octopress-3.0.0.rc.24 vs lib/octopress/docs.rb in octopress-3.0.0.rc.25

- old
+ new

@@ -91,10 +91,13 @@ def self.plugin_options(plugin) options = { name: plugin.name, slug: plugin.slug, type: plugin.type, + version: plugin.version, + gem: plugin.gem, + description: plugin.description, path: plugin.path, source_url: plugin.source_url, website: plugin.website, docs_path: File.join(plugin.assets_path, 'docs'), docs: %w{readme changelog} @@ -219,10 +222,11 @@ require "octopress-hooks" require "octopress/docs/hooks" require "octopress/docs/liquid_filters" require "octopress/docs/jekyll/convertible" require "octopress/docs/jekyll/page" + require "octopress-escape-code" if !options.nil? # Look at the local site and require all of its plugins # Ensuring their documentation is loaded into the docs site # @@ -231,11 +235,9 @@ # Require escape code last to set Octopress hook priority. # options = Docs.site.config.merge(options) end - - require "octopress-escape-code" options end def self.site(options={}) @site ||= Octopress.site(site_options.merge(options))