Merge remote-tracking branch 'upstream/pull/4838'

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index ad19df50e463bd1b292457a369534a2aa351b89e..8b742a585c0e8f7519fb1019222cbcf88216e513 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -18,7 +18,7 @@ class SiteController < ApplicationController
 
   content_security_policy(:only => :id) do |policy|
     policy.connect_src("*")
-    policy.img_src("*", :blob)
+    policy.img_src(*policy.img_src, "*", :blob)
     policy.style_src(*policy.style_src, :unsafe_inline)
   end