Load core plugins using require (#29914, #32938).

Patch by Takashi Kato.

git-svn-id: http://svn.redmine.org/redmine/trunk@21286 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/00-core_plugins.rb b/config/initializers/00-core_plugins.rb
index 3bcd00be6066327f6af446cfe140bfdc73f23baa..e20599000cb88a8262c9a7e64b6a6c9fe1ecc22e 100644 (file)
--- a/config/initializers/00-core_plugins.rb
+++ b/config/initializers/00-core_plugins.rb
@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
 # Loads the core plugins located in lib/plugins
-Dir.glob(File.join(Rails.root, "lib/plugins/*")).sort.each do |directory|
-  if File.directory?(directory)
-    lib = File.join(directory, "lib")
-    if File.directory?(lib)
-      $:.unshift lib
-      ActiveSupport::Dependencies.autoload_paths += [lib]
-    end
-    initializer = File.join(directory, "init.rb")
-    if File.file?(initializer)
-      config = RedmineApp::Application.config
-      eval(File.read(initializer), binding, initializer)
-    end
+Dir.glob(Rails.root.join('lib/plugins/*')).sort.each do |directory|
+  next unless File.directory?(directory)
+
+  initializer = File.join(directory, 'init.rb')
+  if File.file?(initializer)
+    config = RedmineApp::Application.config
+    eval(File.read(initializer), binding, initializer)
   end
 end