mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	changed base templates path to Persona, from Vanilla.
This breaks all themes relying on templates from Vanilla!! See: https://community.nodebb.org/topic/6098/on-changing-the-default-theme-to-persona
This commit is contained in:
		
							
								
								
									
										2
									
								
								app.js
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								app.js
									
									
									
									
									
								
							| @@ -95,7 +95,7 @@ function loadConfig() { | ||||
| 	// Ensure themes_path is a full filepath | ||||
| 	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path'))); | ||||
| 	nconf.set('core_templates_path', path.join(__dirname, 'src/views')); | ||||
| 	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates')); | ||||
| 	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates')); | ||||
|  | ||||
| 	if (!process.send) { | ||||
| 		// If run using `node app`, log GNU copyright info along with server info | ||||
|   | ||||
| @@ -34,7 +34,7 @@ module.exports = function(Meta) { | ||||
| 				return callback(err); | ||||
| 			} | ||||
|  | ||||
| 			var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'), | ||||
| 			var themeId = (themeData['theme:id'] || 'nodebb-theme-persona'), | ||||
| 				baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')), | ||||
| 				paths = [ | ||||
| 					baseThemePath, | ||||
|   | ||||
| @@ -119,7 +119,7 @@ module.exports = function(Meta) { | ||||
| 				return callback(err); | ||||
| 			} | ||||
|  | ||||
| 			var themeId = data.currentThemeId || 'nodebb-theme-vanilla'; | ||||
| 			var themeId = data.currentThemeId || 'nodebb-theme-persona'; | ||||
|  | ||||
| 			var	themeObj = data.themesData.filter(function(themeObj) { | ||||
| 					return themeObj.id === themeId; | ||||
|   | ||||
| @@ -89,6 +89,12 @@ function initializeNodeBB(callback) { | ||||
| 		function(next) { | ||||
| 			plugins.init(app, middleware, next); | ||||
| 		}, | ||||
| 		function(next) { | ||||
| 			plugins.fireHook('static:app.preload', { | ||||
| 				app: app, | ||||
| 				middleware: middleware | ||||
| 			}, next); | ||||
| 		}, | ||||
| 		function(next) { | ||||
| 			async.parallel([ | ||||
| 				async.apply(meta.templates.compile), | ||||
| @@ -98,12 +104,6 @@ function initializeNodeBB(callback) { | ||||
| 			], next); | ||||
| 		}, | ||||
| 		function(results, next) { | ||||
| 			plugins.fireHook('static:app.preload', { | ||||
| 				app: app, | ||||
| 				middleware: middleware | ||||
| 			}, next); | ||||
| 		}, | ||||
| 		function(next) { | ||||
| 			routes(app, middleware); | ||||
| 			next(); | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user