Merge 192a28c6ed into 407aacfa19

2 weeks ago · f1a02ccc91
parent 407aacfa19 192a28c6ed
commit f1a02ccc91
1 changed files with 2 additions and 1 deletions
--- a/server/controllers/upload.js
+++ b/server/controllers/upload.js
@ -76,7 +76,8 @@ router.post('/u', (req, res, next) => {
  }

  // Sanitize filename
-  fileMeta.originalname = sanitize(fileMeta.originalname.toLowerCase().replace(/[\s,;#]+/g, '_'))
+  let time = new Date().getTime()
+  fileMeta.originalname = req.user.name + "_" + time + "_" + sanitize(fileMeta.originalname.toLowerCase().replace(/[\s,;#]+/g, '_'))

  // Check if user can upload at path
  const assetPath = (folderId) ? hierarchy.map(h => h.slug).join('/') + `/${fileMeta.originalname}` : fileMeta.originalname