github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not use cached settings during theme compilation

Browse Source 
We compile within a database transaction, so using a cached value from redis can cause unwanted side effects
This commit is contained in:
David Taylor
2020-05-01 17:51:11 +01:00
parent 4f885d7da2
commit a51b8d9c66
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/themes_controller.rb
View File

@ -270,13 +270,13 @@ class Admin::ThemesController < Admin::AdminController
setting_name = params[:name].to_sym
new_value = params[:value] || nil
previous_value = @theme.included_settings[setting_name]
previous_value = @theme.cached_settings[setting_name]
@theme.update_setting(setting_name, new_value)
@theme.save
log_theme_setting_change(setting_name, previous_value, new_value)
updated_setting = @theme.included_settings.select { |key, val| key == setting_name }
updated_setting = @theme.cached_settings.select { |key, val| key == setting_name }
render json: updated_setting, status: :ok
end