Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Fixed that viewing the history of a wiki page with attachments raises an error (#12801).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11157 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-01-10 21:38:11 +00:00
parent a103e0cd26
commit d0ffc0575a
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -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 && obj.respond_to?(:attachments))
if options[:attachments].present? || obj.respond_to?(:attachments)
attachments = options[:attachments] || []
attachments += obj.attachments if obj
attachments += obj.attachments if obj.respond_to?(:attachments)
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