summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-03-03 17:04:50 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-03-03 17:04:50 +0000
commitf6d8752e442cf1b4fa7c5004c86b9597ff8e94b1 (patch)
tree956d53f5e5ad4209c87272022007c7d8855419a8 /app
parent3c0c0a767777b54e20a607c44037ffa20b92d316 (diff)
downloadredmine-f6d8752e442cf1b4fa7c5004c86b9597ff8e94b1.tar.gz
redmine-f6d8752e442cf1b4fa7c5004c86b9597ff8e94b1.zip
Fixes destroying attachments if the update fails. (r2875 r3523)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3526 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/issues_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 4ac11162c..1bbd9b739 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -213,7 +213,7 @@ class IssuesController < ApplicationController
# Optimistic locking exception
flash.now[:error] = l(:notice_locking_conflict)
# Remove the previously added attachments if issue was not updated
- attachments.each(&:destroy)
+ attachments[:files].each(&:destroy) if attachments[:files]
end
def reply