From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 May 2024 09:31:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4840'
X-Git-Tag: live~991
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c8748442aefde3c199586b6bd4f77946ff157b07?hp=affa9bbf15a8c7206c8f25b50904ddf2df1d2aa0

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 172be5653..265901bec 100644
--- 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.script_src(*policy.script_src, "dev.virtualearth.net", :unsafe_eval)
     policy.style_src(*policy.style_src, :unsafe_inline)
   end