aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-06-21 09:03:20 +0200
committerChocobozzz <me@florianbigard.com>2022-06-21 09:03:20 +0200
commit2b621ac0ebe83693bba6354b3482a03ba58143e7 (patch)
tree12939dc3d41060ce82c0c18273ac600e1df860d3 /server/models
parenta3d15b64711c7b7109d256c82094ee20c2c3df9a (diff)
parent494081f89d4d1456b89d830a8e52c98a2c02b0b4 (diff)
downloadPeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.tar.gz
PeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.tar.zst
PeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.zip
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video-playlist-element.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts
index 4e4160818..b45f15bd6 100644
--- a/server/models/video/video-playlist-element.ts
+++ b/server/models/video/video-playlist-element.ts
@@ -351,7 +351,7 @@ export class VideoPlaylistElementModel extends Model<Partial<AttributesOnly<Vide
351 id: this.url, 351 id: this.url,
352 type: 'PlaylistElement', 352 type: 'PlaylistElement',
353 353
354 url: this.Video.url, 354 url: this.Video?.url || null,
355 position: this.position 355 position: this.position
356 } 356 }
357 357