Bumped to version v5.2.1

[github/Chocobozzz/PeerTube.git] / server / lib / plugins / theme-utils.ts

diff --git a/server/lib/plugins/theme-utils.ts b/server/lib/plugins/theme-utils.ts
index 066339e65e32065a50d8285960b6e566188f7227..76c671f1cee6e56bd024aa14be50c89008782b55 100644 (file)
--- a/server/lib/plugins/theme-utils.ts
+++ b/server/lib/plugins/theme-utils.ts
@@ -1,18 +1,18 @@
-import { DEFAULT_THEME } from '../../initializers/constants'
+import { DEFAULT_THEME_NAME, DEFAULT_USER_THEME_NAME } from '../../initializers/constants'
 import { PluginManager } from './plugin-manager'
 import { CONFIG } from '../../initializers/config'
 
-function getThemeOrDefault (name: string) {
+function getThemeOrDefault (name: string, defaultTheme: string) {
   if (isThemeRegistered(name)) return name
 
   // Fallback to admin default theme
-  if (name !== CONFIG.THEME.DEFAULT) return getThemeOrDefault(CONFIG.THEME.DEFAULT)
+  if (name !== CONFIG.THEME.DEFAULT) return getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
 
-  return DEFAULT_THEME
+  return defaultTheme
 }
 
 function isThemeRegistered (name: string) {
-  if (name === DEFAULT_THEME) return true
+  if (name === DEFAULT_THEME_NAME || name === DEFAULT_USER_THEME_NAME) return true
 
   return !!PluginManager.Instance.getRegisteredThemes()
                         .find(r => r.name === name)