From b0a7f9c8c9694a6e324d5c0abde5b11fb685a755 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 5 Nov 2014 18:50:38 -0800
Subject: [PATCH] Require plugins from Gemfile :jekyll_plugins group.

---
 bin/jekyll                   | 2 ++
 lib/jekyll/plugin_manager.rb | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 194295c8..060c9125 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -13,6 +13,8 @@ require 'mercenary'
   end
 end
 
+Jekyll::PluginManager.require_from_bundler
+
 Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 394aa9d6..d484ef35 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -17,7 +17,7 @@ module Jekyll
     def conscientious_require
       require_plugin_files
       require_gems
-      require_from_bundler
+      self.require_from_bundler
     end
 
     # Require each of the gem plugins specified.
@@ -31,10 +31,11 @@ module Jekyll
       end
     end
 
-    def require_from_bundler
-      unless site.safe
+    def self.require_from_bundler
+      unless ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
         require "bundler/setup"
         Bundler.require(:jekyll_plugins)
+        ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = true
       end
     rescue LoadError
       false