diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /server/models/account/account.ts | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'server/models/account/account.ts')
| -rw-r--r-- | server/models/account/account.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 6bbfc6f4e..580d920ce 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
| @@ -134,8 +134,8 @@ export class AccountModel extends Model<AccountModel> { | |||
| 134 | return undefined | 134 | return undefined |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | static load (id: number) { | 137 | static load (id: number, transaction?: Sequelize.Transaction) { |
| 138 | return AccountModel.findById(id) | 138 | return AccountModel.findById(id, { transaction }) |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | static loadByUUID (uuid: string) { | 141 | static loadByUUID (uuid: string) { |