Merge branch 'master' into DepauMD

This commit is contained in:
Davide Depau 2018-12-21 03:00:12 +01:00
commit 4395b1dcfa

View file

@ -1,5 +1,5 @@
'use strict'
const url = require('url')
const URL = require('url').URL
const path = require('path')
const config = require('../../config')
@ -16,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {
return
}
callback(null, url.URL.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))
callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)
}