From 5b106a3453a16e1eca1e90d16f38d674e4cc0630 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 16 Feb 2026 17:20:51 +0900 Subject: [PATCH] [Fix undefined `current_flavour` in controllers (/settings/flavours page) (#3400) * [Glitch] Fix undefined `current_flavour` in controllers After the theming infrastructure migration (#37612, #37807), `ThemingConcern` was removed and theme-related methods were moved to `ThemeHelper`. However, controllers like `Settings::FlavoursController` call `current_flavour` directly in their actions, which is not accessible from a view helper module. Include `ThemeHelper` in `ApplicationController` to restore access to `current_flavour`, `current_skin`, `current_theme`, and other theme methods in all controllers. Co-authored-by: Cursor * Include ThemeHelper in Settings::FlavoursController instead of ApplicationController --------- Co-authored-by: Cursor --- app/controllers/settings/flavours_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/settings/flavours_controller.rb b/app/controllers/settings/flavours_controller.rb index b179b9429f..ef194784f4 100644 --- a/app/controllers/settings/flavours_controller.rb +++ b/app/controllers/settings/flavours_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Settings::FlavoursController < Settings::BaseController + include ThemeHelper + layout 'admin' before_action :authenticate_user!