From 62e4b9f385673c7ea5e047f64993f0a3b7f0ec21 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 14 Sep 2014 14:14:44 +0000
Subject: [PATCH] Merged r13404 from trunk to 2.4-stable (#17581)

stricter check of uploading attachments.

Contributed by fred bregar.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13406 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/attachments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index a67ca4a72..318c3c03f 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();
-- 
2.39.5