From 71cf83b314d4f016b0bd10673250f494e8643d71 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Oct 2013 16:00:34 +0100
Subject: [PATCH] Added fix to correctly parse non-array error messages
Some apps like the antivirus app return messages in a non-array format.
---
apps/files/js/file-upload.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 5bf4f5c0981..95c0723f254 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -334,8 +334,13 @@ $(document).ready(function() {
var result=$.parseJSON(response);
delete data.jqXHR;
-
- if (typeof result[0] === 'undefined') {
+
+ if (result.status === 'error' && result.data && result.data.message){
+ data.textStatus = 'servererror';
+ data.errorThrown = result.data.message;
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ } else if (typeof result[0] === 'undefined') {
data.textStatus = 'servererror';
data.errorThrown = t('files', 'Could not get result from server.');
var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');