Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-18 02:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use package.name for theme.id (#8965)

Browse Source 
Prevents cases like #8953
This commit is contained in:
Peter Jaszkowiak
2020-11-26 14:59:23 -07:00
committed by GitHub
parent e1432caf92
commit ba3981e270
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/meta/themes.js
View File

@@ -25,9 +25,16 @@ Themes.get = async () => {
themes = _.flatten(themes).filter(Boolean); themes = _.flatten(themes).filter(Boolean);
themes = await Promise.all(themes.map(async (theme) => { themes = await Promise.all(themes.map(async (theme) => {
const config = path.join(themePath, theme, 'theme.json'); const config = path.join(themePath, theme, 'theme.json');
const pack = path.join(themePath, theme, 'package.json');
try { try {
const file = await fs.promises.readFile(config, 'utf8'); const [configFile, packageFile] = await Promise.all([
const configObj = JSON.parse(file); fs.promises.readFile(config, 'utf8'),
fs.promises.readFile(pack, 'utf8'),
]);
const configObj = JSON.parse(configFile);
const packageObj = JSON.parse(packageFile);
configObj.id = packageObj.name;
// Minor adjustments for API output // Minor adjustments for API output
configObj.type = 'local'; configObj.type = 'local';