IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: limit SvgSprite scan to string setting values

Browse Source
This commit is contained in:
Penar Musaraj
2018-11-29 18:36:48 -05:00
parent 0eacd45ab1
commit a58c3ca430
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/svg_sprite/svg_sprite.rb
View File

@@ -287,7 +287,7 @@ Discourse SVG subset of #{fa_license}
site_setting_icons = [] site_setting_icons = []
SiteSetting.settings_hash.select do |key, value| SiteSetting.settings_hash.select do |key, value|
if key.to_s.include?("_icon") && value.present? if key.to_s.include?("_icon") && value.present? && value.class == String
site_setting_icons |= value.split('|') site_setting_icons |= value.split('|')
end end
end end
@@ -317,7 +317,7 @@ Discourse SVG subset of #{fa_license}
# Theme.all includes default values # Theme.all includes default values
Theme.all.each do |theme| Theme.all.each do |theme|
settings = theme.cached_settings.each do |key, value| settings = theme.cached_settings.each do |key, value|
if key.to_s.include?("_icon") && value.present? if key.to_s.include?("_icon") && value.present? && value.class == String
theme_icon_settings |= value.split('|') theme_icon_settings |= value.split('|')
end end
end end