diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-06-11 19:16:00 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-06-11 19:16:00 +0200 |
| commit | 6ccdf3a23ecec5ba2eeaf487fd1fafdc7606b4bf (patch) | |
| tree | fdbae8827da56dc9039925b090add90ce24a6e2c /server/controllers/services.ts | |
| parent | 77540346413259e4ec62ee8302e503bcd2a01047 (diff) | |
| download | PeerTube-6ccdf3a23ecec5ba2eeaf487fd1fafdc7606b4bf.tar.gz PeerTube-6ccdf3a23ecec5ba2eeaf487fd1fafdc7606b4bf.tar.zst PeerTube-6ccdf3a23ecec5ba2eeaf487fd1fafdc7606b4bf.zip | |
Fix import with when the imported file has the same extension than an
already existing file
Diffstat (limited to 'server/controllers/services.ts')
| -rw-r--r-- | server/controllers/services.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/controllers/services.ts b/server/controllers/services.ts index 1f82db9c4..1dd8e28e5 100644 --- a/server/controllers/services.ts +++ b/server/controllers/services.ts | |||
| @@ -45,7 +45,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr | |||
| 45 | thumbnailUrl = undefined | 45 | thumbnailUrl = undefined |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts" src="${embedUrl}" frameborder="0" allowfullscreen></iframe>` | 48 | const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts" ` + |
| 49 | `src="${embedUrl}" frameborder="0" allowfullscreen></iframe>` | ||
| 49 | 50 | ||
| 50 | const json: any = { | 51 | const json: any = { |
| 51 | type: 'video', | 52 | type: 'video', |