From 72ad5bf8bdbaf9b7862adafbf1b7e6bb5dfd7564 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 21 Dec 2021 20:51:18 +0100 Subject: [PATCH] FIX: SiteSetting.title was being polluted in StaticController (#15385) Regressed in #15324 --- app/controllers/static_controller.rb | 2 +- spec/requests/static_controller_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 20617146cf..6db0adabf8 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -59,7 +59,7 @@ class StaticController < ApplicationController return end - @title = SiteSetting.title + @title = SiteSetting.title.dup if SiteSetting.short_site_description.present? @title << " - #{SiteSetting.short_site_description}" diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb index 68c4d0d784..406a05a3d1 100644 --- a/spec/requests/static_controller_spec.rb +++ b/spec/requests/static_controller_spec.rb @@ -323,6 +323,16 @@ describe StaticController do expect(response.body).to include("Polish FAQ") end end + + it "does not pollute SiteSetting.title (regression)" do + SiteSetting.title = "test" + SiteSetting.short_site_description = "something" + + expect do + get "/login" + get "/login" + end.to_not change { SiteSetting.title } + end end describe '#enter' do