Merged r6206 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-09 12:01:56 +00:00
parent 0527e8cedf
commit a8550ba8a6
2 changed files with 22 additions and 8 deletions
@@ -212,6 +212,10 @@ class WikiAnnotate
      break unless @lines.detect { |line| line[0].nil? }
      current = current.previous
    end
-    @lines.each { |line| line[0] ||= current.version }
+    @lines.each { |line| 
+      line[0] ||= current.version
+      # if the last known version is > 1 (eg. history was cleared), we don't know the author
+      line[1] ||= current.author if current.version == 1
+    }
  end
 end