diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2022-04-22 09:56:12 +0200 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2022-04-22 11:24:25 +0200 |
| commit | 850d8ac1cd9e5b28e37668469237d8daa5c5d51d (patch) | |
| tree | 995400b3fe2e8f8b07b250ade23ceb9817ac11ba /apps/theming/lib | |
| parent | 05a33ad713f47b8cfe400447ec9c4c1f8be310bd (diff) | |
| download | nextcloud-server-850d8ac1cd9e5b28e37668469237d8daa5c5d51d.tar.gz nextcloud-server-850d8ac1cd9e5b28e37668469237d8daa5c5d51d.zip | |
Add default theming disabled fallback
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/theming/lib')
| -rw-r--r-- | apps/theming/lib/Service/ThemeInjectionService.php | 1 | ||||
| -rw-r--r-- | apps/theming/lib/Service/ThemesService.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/theming/lib/Service/ThemeInjectionService.php b/apps/theming/lib/Service/ThemeInjectionService.php index 81edc19bc4b..fec14de96cf 100644 --- a/apps/theming/lib/Service/ThemeInjectionService.php +++ b/apps/theming/lib/Service/ThemeInjectionService.php @@ -22,7 +22,6 @@ */ namespace OCA\Theming\Service; -use OCA\Theming\AppInfo\Application; use OCA\Theming\Themes\DefaultTheme; use OCP\IURLGenerator; use OCP\Util; diff --git a/apps/theming/lib/Service/ThemesService.php b/apps/theming/lib/Service/ThemesService.php index c2e9e2b24bf..01ebc3fb504 100644 --- a/apps/theming/lib/Service/ThemesService.php +++ b/apps/theming/lib/Service/ThemesService.php @@ -99,7 +99,7 @@ class ThemesService { return $t->getId(); }, array_values($filteredThemes)); - $enabledThemes = [...array_diff($themesIds, $filteredThemesIds), $theme->getId()]; + $enabledThemes = array_merge(array_diff($themesIds, $filteredThemesIds), [$theme->getId()]); $this->setEnabledThemes($enabledThemes); return $enabledThemes; |