FIX: include both name and id in color scheme stylesheet filename slu…

…gs (#10397)
discourse · Aug 7, 2020 · f179510 · f179510
1 parent 07dc5b5
commit f179510
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
@@ -106,7 +106,7 @@ def self.color_scheme_stylesheet_details(color_scheme_id = nil, media)
 
     target = COLOR_SCHEME_STYLESHEET.to_sym
     current_hostname = Discourse.current_hostname
-    color_scheme_name = Slug.for(color_scheme.name)
+    color_scheme_name = Slug.for(color_scheme.name) + color_scheme&.id.to_s
     array_cache_key = "color_scheme_stylesheet_#{color_scheme_name}_#{current_hostname}"
     stylesheets = cache[array_cache_key]
     return stylesheets if stylesheets.present?
@@ -300,7 +300,7 @@ def qualified_target
     if is_theme?
       "#{@target}_#{theme.id}"
     elsif @color_scheme
-      "#{@target}_#{Slug.for(@color_scheme.name)}"
+      "#{@target}_#{Slug.for(@color_scheme.name) + @color_scheme&.id.to_s}"
     else
       scheme_string = theme && theme.color_scheme ? "_#{theme.color_scheme.id}" : ""
       "#{@target}#{scheme_string}"

diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
@@ -193,12 +193,13 @@
       SiteSetting.default_theme_id = theme.id
 
       link = Stylesheet::Manager.color_scheme_stylesheet_link_tag()
-      expect(link).to include("/stylesheets/color_definitions_funky_")
+      expect(link).to include("/stylesheets/color_definitions_funky#{cs.id}_")
     end
 
     it "uses the correct scheme when colors are passed" do
       link = Stylesheet::Manager.color_scheme_stylesheet_link_tag(ColorScheme.first.id)
-      expect(link).to include("/stylesheets/color_definitions_#{Slug.for(ColorScheme.first.name)}_")
+      slug = Slug.for(ColorScheme.first.name) + ColorScheme.first.id.to_s
+      expect(link).to include("/stylesheets/color_definitions_#{slug}_")
     end
 
     it "does not fail with a color scheme name containing spaces and special characters" do
@@ -207,7 +208,7 @@
       SiteSetting.default_theme_id = theme.id
 
       link = Stylesheet::Manager.color_scheme_stylesheet_link_tag()
-      expect(link).to include("/stylesheets/color_definitions_funky-bunch_")
+      expect(link).to include("/stylesheets/color_definitions_funky-bunch#{cs.id}_")
     end
 
   end