FIX: don't search for plugins in nested subdirectories

2017-05-16 17:28:45 -04:00 · 2017-05-16 17:28:45 -04:00 · 6a1f579c6e
parent 5d494cf158
commit 6a1f579c6e
2 changed files with 1 additions and 1 deletions
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@ -46,7 +46,7 @@ class Plugin::Instance
  def self.find_all(parent_path)
    [].tap { |plugins|
      # also follows symlinks - http://stackoverflow.com/q/357754
-      Dir["#{parent_path}/**/*/**/plugin.rb"].sort.each do |path|
+      Dir["#{parent_path}/*/plugin.rb"].sort.each do |path|

        # tagging is included in core, so don't load it
        next if path =~ /discourse-tagging/
--- a/spec/fixtures/plugins/my_plugin/nested/plugin.rb
+++ b/spec/fixtures/plugins/my_plugin/nested/plugin.rb