From d7a08d81b6e2744ec5676950addcc54fe03333b1 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 1 Jul 2025 19:43:59 +0200 Subject: [PATCH] Fix error on log-in from old users requiring ToS interstitial when said ToS has been removed (#35233) --- app/controllers/concerns/web_app_controller_concern.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb index 77af01580..39fc948e9 100644 --- a/app/controllers/concerns/web_app_controller_concern.rb +++ b/app/controllers/concerns/web_app_controller_concern.rb @@ -50,6 +50,13 @@ module WebAppControllerConcern return unless current_user&.require_tos_interstitial? @terms_of_service = TermsOfService.published.first + + # Handle case where terms of service have been removed from the database + if @terms_of_service.nil? + current_user.update(require_tos_interstitial: false) + return + end + render 'terms_of_service_interstitial/show', layout: 'auth' end