summaryrefslogtreecommitdiff
path: root/src/client/plugin.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-02-07 18:23:23 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-02-07 18:23:23 +0900
commit49e6c2ed75a7b960615a8d680046b5aab11072f1 (patch)
tree75e65504c619ef31c7d917a0130731c5d9378617 /src/client/plugin.ts
parentMerge branch 'develop' (diff)
parent12.69.0 (diff)
downloadmisskey-49e6c2ed75a7b960615a8d680046b5aab11072f1.tar.gz
misskey-49e6c2ed75a7b960615a8d680046b5aab11072f1.tar.bz2
misskey-49e6c2ed75a7b960615a8d680046b5aab11072f1.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/plugin.ts')
-rw-r--r--src/client/plugin.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/plugin.ts b/src/client/plugin.ts
index 9d1ef87c1a..c56ee1eb25 100644
--- a/src/client/plugin.ts
+++ b/src/client/plugin.ts
@@ -39,7 +39,7 @@ export function install(plugin) {
function createPluginEnv(opts) {
const config = new Map();
for (const [k, v] of Object.entries(opts.plugin.config || {})) {
- config.set(k, jsToVal(opts.plugin.configData[k] || v.default));
+ config.set(k, jsToVal(opts.plugin.configData.hasOwnProperty(k) ? opts.plugin.configData[k] : v.default));
}
return {