Code cleanup (#12801).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11158 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4118d5bacb0010bdede871f6fe88b24ad595fda7..07242c005be4e3e062fcba8deacff77718c882cc 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -545,9 +545,9 @@ module ApplicationHelper
 
   def parse_inline_attachments(text, project, obj, attr, only_path, options)
     # when using an image link, try to use an attachment, if possible
-    if options[:attachments].present? || obj.respond_to?(:attachments)
-      attachments = options[:attachments] || []
-      attachments += obj.attachments if obj.respond_to?(:attachments)
+    attachments = options[:attachments] || []
+    attachments += obj.attachments if obj.respond_to?(:attachments)
+    if attachments.present?
       text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
         filename, ext, alt, alttext = $1.downcase, $2, $3, $4
         # search for the picture in attachments