comparison app/models/.svn/text-base/wiki_page.rb.svn-base @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Thu, 14 Jul 2011 10:37:36 +0100
parents 0c939c159af4
children
comparison
equal deleted inserted replaced
506:1551c61843d2 508:851510f1b535
210 positions.compact! 210 positions.compact!
211 # Stop if every line is annotated 211 # Stop if every line is annotated
212 break unless @lines.detect { |line| line[0].nil? } 212 break unless @lines.detect { |line| line[0].nil? }
213 current = current.previous 213 current = current.previous
214 end 214 end
215 @lines.each { |line| line[0] ||= current.version } 215 @lines.each { |line|
216 line[0] ||= current.version
217 # if the last known version is > 1 (eg. history was cleared), we don't know the author
218 line[1] ||= current.author if current.version == 1
219 }
216 end 220 end
217 end 221 end