Memoize Site#site_data (jekyll#6809)

Merge pull request 6809
steelman · Mar 14, 2018 · 55d64c7 · 55d64c7
1 parent 6a7a393
commit 55d64c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
@@ -93,6 +93,7 @@ def reset
       self.pages = []
       self.static_files = []
       self.data = {}
+      @site_data = nil
       @collections = nil
       @docs_to_write = nil
       @regenerator.clear_cache
@@ -254,7 +255,7 @@ def categories
     #
     # Returns the Hash to be hooked to site.data.
     def site_data
-      config["data"] || data
+      @site_data ||= (config["data"] || data)
     end
 
     # The Hash payload containing site-wide data.