Merge r22569 from trunk to 5.1-stable (#39862).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22570 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 9c09a7870f16de8e7cd4aec1b3da01837c54bbed..43efe8cd3c7dddc00af07d716ab7b13afcdb62bc 100644 (file)
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -39,7 +39,7 @@ module Redmine
           end
 
           def param_expression
-            @param_expression ||= Regexp.new("^(#{object_types.join("|")})$")
+            @param_expression ||= Regexp.new("^(#{object_types.to_a.join("|")})$")
           end
         end
       end