From 3183bf6fc529495a092aa931623acf92de71f6b5 Mon Sep 17 00:00:00 2001
From: tohosaku <tohosaku@users.osdn.me>
Date: Thu, 21 Oct 2021 01:35:53 +0000
Subject: [PATCH 4/5] Load core plugins with "require"

---
 config/initializers/00-core_plugins.rb     | 19 +++++++------------
 lib/plugins/acts_as_tree/init.rb           |  1 +
 lib/plugins/gravatar/init.rb               |  2 +-
 lib/plugins/open_id_authentication/init.rb |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/config/initializers/00-core_plugins.rb b/config/initializers/00-core_plugins.rb
index 3bcd00be6..e20599000 100644
--- 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
diff --git a/lib/plugins/acts_as_tree/init.rb b/lib/plugins/acts_as_tree/init.rb
index e45bc11e5..cb8394e97 100644
--- a/lib/plugins/acts_as_tree/init.rb
+++ b/lib/plugins/acts_as_tree/init.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+require File.dirname(__FILE__) + '/lib/active_record/acts/tree'
 ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree
diff --git a/lib/plugins/gravatar/init.rb b/lib/plugins/gravatar/init.rb
index 5bf49923d..aafad7613 100644
--- a/lib/plugins/gravatar/init.rb
+++ b/lib/plugins/gravatar/init.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'gravatar'
+require File.dirname(__FILE__) + '/lib/gravatar'
 ActionView::Base.send :include, GravatarHelper::PublicMethods
diff --git a/lib/plugins/open_id_authentication/init.rb b/lib/plugins/open_id_authentication/init.rb
index ec96a5a7f..f3314807f 100644
--- a/lib/plugins/open_id_authentication/init.rb
+++ b/lib/plugins/open_id_authentication/init.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
-require 'open_id_authentication'
+require File.dirname(__FILE__) + '/lib/open_id_authentication'
 
 config.middleware.use OpenIdAuthentication
 
-- 
2.30.2