From b84bd21089d305333fa4114b95be70f5ad94ad1b Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Wed, 6 Sep 2017 16:23:37 -0500
Subject: more robust file upload extension (#7390)

---
 webapp/components/file_upload.jsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx
index eb966aeed..479dfa145 100644
--- a/webapp/components/file_upload.jsx
+++ b/webapp/components/file_upload.jsx
@@ -296,8 +296,16 @@ class FileUpload extends React.Component {
                     min = String(d.getMinutes());
                 }
 
-                const ext = file.name.lastIndexOf('.');
-                const name = formatMessage(holders.pasted) + d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + hour + '-' + min + (ext >= 0 ? file.name.substr(ext) : '');
+                var ext = '';
+                if (file.name) {
+                    if (file.name.includes('.')) {
+                        ext = file.name.substr(file.name.lastIndexOf('.'));
+                    }
+                } else if (items[i].type.includes('/')) {
+                    ext = '.' + items[i].type.split('/')[1].toLowerCase();
+                }
+
+                const name = formatMessage(holders.pasted) + d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + hour + '-' + min + ext;
 
                 const request = uploadFile(
                     file,
-- 
cgit v1.2.3-1-g7c22