Fix a nil error when a Project cannot save attachments.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 03:54:17 +00:00
parent 759858d11d
commit c56c0f411c
2 changed files with 33 additions and 1 deletions
@@ -150,7 +150,13 @@ class Attachment < ActiveRecord::Base
                              :file => file,
                              :description => attachment['description'].to_s.strip,
                              :author => User.current)
-        a.new_record? ? (obj.unsaved_attachments << a) : (attached << a)
+
+        if a.new_record?
+          obj.unsaved_attachments ||= []
+          obj.unsaved_attachments << a
+        else
+          attached << a
+        end
      end
    end
    {:files => attached, :unsaved => obj.unsaved_attachments}