diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/tools/cli.ts | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/tools/cli.ts')
| -rw-r--r-- | server/tools/cli.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tools/cli.ts b/server/tools/cli.ts index 53b20964e..108c44218 100644 --- a/server/tools/cli.ts +++ b/server/tools/cli.ts | |||
| @@ -23,7 +23,7 @@ async function getSettings () { | |||
| 23 | if (err) { | 23 | if (err) { |
| 24 | return rej(err) | 24 | return rej(err) |
| 25 | } | 25 | } |
| 26 | return res(data || settings) | 26 | return res(Object.keys(data).length === 0 ? settings : data) |
| 27 | }) | 27 | }) |
| 28 | }) | 28 | }) |
| 29 | } | 29 | } |