From 5d22bc551096e52c0a7eb7b4b9e416e82d02ff9c Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 23 Jul 2014 08:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb                      | 2 +-
 lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index b5c67478c..a8ba3d426 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -163,7 +163,7 @@ class FilesController < ApplicationController
     end
    end
 
-  # 返回制定资源类型的资源列表
+  # 返回指定资源类型的资源列表
   # added by nwb
   def getattachtype
     sort_init 'created_on', 'desc' 
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 8b368ab1e..b9e6174ae 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -84,9 +84,11 @@ module Redmine
 
         def save_attachments(attachments, author=User.current)
           # 清除临时文件
-          tempAttach = attachments[:dummy]
-          if  tempAttach && tempAttach[:file]
-            attachments.delete(:dummy)
+          if attachments
+            tempAttach = attachments[:dummy]
+            if  tempAttach && tempAttach[:file]
+              attachments.delete(:dummy)
+            end
           end
 
           if attachments.is_a?(Hash)