From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 14 Sep 2014 13:44:24 +0000 (+0000)
Subject: stricter check of uploading attachments (#17581)
X-Git-Tag: 2.6.0~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98589f0ecda40cf957d2d6fa62c9201737061d21;p=redmine.git

stricter check of uploading attachments (#17581)

Contributed by fred bregar.

git-svn-id: http://svn.redmine.org/redmine/trunk@13404 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 229235f83..f80098665 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -119,7 +119,7 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
 function addInputFiles(inputEl) {
   var clearedFileInput = $(inputEl).clone().val('');
 
-  if (inputEl.files) {
+  if ($.ajaxSettings.xhr().upload && inputEl.files) {
     // upload files using ajax
     uploadAndAttachFiles(inputEl.files, inputEl);
     $(inputEl).remove();