From 943258aebe37afff36f04a7191129c7bcdb1ff87 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 17 Mar 2015 17:29:35 +0800
Subject: [PATCH] =?UTF-8?q?#2025=20=E9=A1=B9=E7=9B=AE--=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=9A=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E7=B1=BB=E8=B5=84=E6=BA=90=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E8=AF=BE=E4=BB=B6=E2=80=9D=E6=88=96=E2=80=9C=E7=A0=94=E7=A9=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E2=80=9D=EF=BC=8C=E6=88=90=E5=8A=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=90=8E=EF=BC=8C=E9=83=BD=E6=98=AF=E6=BA=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/attachments.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 8ea71909b..8fbaa5981 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -135,8 +135,11 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
     loadstartEventHandler: $.noop,
     progressEventHandler: $.noop
   }, options);
-
-  uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+  if(uploadUrl.indexOf('?') > 0){
+      uploadUrl = uploadUrl + '&attachment_id=' + attachmentId;
+  }else{
+    uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+  }
   if (blob instanceof window.File) {
     uploadUrl += '&filename=' + encodeURIComponent(blob.name);
   }