mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-20 22:42:53 -05:00
Changed to getActive from bridge in toJSON
refs: bf0823c9a2
- continuing the work of splitting up the theme service into logical components
- this file is not part of the theme engine so it should use the bridge not the engine
- am about to move the theme service to core/server so this will make even more sense then
This commit is contained in:
parent
af09d55c7a
commit
53669b6e71
1 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
const _ = require('lodash');
|
||||
const themeList = require('./list');
|
||||
const active = require('../theme-engine/active');
|
||||
const bridge = require('../../../bridge');
|
||||
const packageJSON = require('../../../server/lib/fs/package-json');
|
||||
const settingsCache = require('../../../server/services/settings/cache');
|
||||
|
||||
|
@ -40,8 +40,8 @@ module.exports = function toJSON(name, checkedTheme) {
|
|||
}
|
||||
|
||||
// CASE: if you want a JSON response for a single theme, which is not active.
|
||||
if (_.find(themeResult, {active: true}) && active.get()) {
|
||||
_.find(themeResult, {active: true}).templates = active.get().customTemplates;
|
||||
if (_.find(themeResult, {active: true}) && bridge.getActiveTheme()) {
|
||||
_.find(themeResult, {active: true}).templates = bridge.getActiveTheme().customTemplates;
|
||||
}
|
||||
|
||||
return {themes: themeResult};
|
||||
|
|
Loading…
Add table
Reference in a new issue