summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorportix <none@none>2013-02-05 21:11:54 +0100
committerportix <none@none>2013-02-05 21:11:54 +0100
commitdb00bef10862a638c24556c32261fc00571f9f96 (patch)
treea31b0555a308a70d75843037d11badb99a55a5d7 /scripts
parent1a877975a64c738fa0f3d893421844c4d064816a (diff)
downloaddwb-db00bef10862a638c24556c32261fc00571f9f96.zip
Test if a config is null in extensions.getConfig
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/extensions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/extensions.js b/scripts/lib/extensions.js
index 40bf6d6c..7638c0c8 100644
--- a/scripts/lib/extensions.js
+++ b/scripts/lib/extensions.js
@@ -115,7 +115,7 @@
else
{
for (k in dc)
- config[k] = typeof c[k] === typeof dc[k] ? c[k] : dc[k];
+ config[k] = typeof c[k] === typeof dc[k] || c[k] === null ? c[k] : dc[k];
}
return config;
}