From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jan 2013 21:40:04 +0000 (+0000)
Subject: Code cleanup (#12801).
X-Git-Tag: 2.3.0~326
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=18061b641fe8671d4fd28c8ab3adfa2fe12f19aa;p=redmine.git

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 4118d5bac..07242c005 100644
--- 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