From: Tom Hughes <tom@compton.nu>
Date: Sat, 1 Mar 2025 12:29:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5731'
X-Git-Tag: live~175
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/30415443e95494fd9c217c7d83c9aa2d13d203fd?hp=-c

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

30415443e95494fd9c217c7d83c9aa2d13d203fd
diff --combined app/assets/javascripts/leaflet.share.js
index 9f774df7d,42e195f0a..d84f8820e
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@@ -159,7 -159,6 +159,7 @@@ L.OSM.share = function (options) 
            .attr("class", "form-select w-auto")
            .append($("<option>").val("png").text("PNG").prop("selected", true))
            .append($("<option>").val("jpeg").text("JPEG"))
 +          .append($("<option>").val("webp").text("WEBP"))
            .append($("<option>").val("svg").text("SVG"))
            .append($("<option>").val("pdf").text("PDF"))));
  
@@@ -228,13 -227,11 +228,11 @@@
          .appendTo($form);
      }
  
-     const csrf_param = $("meta[name=csrf-param]").attr("content"),
-           csrf_token = $("meta[name=csrf-token]").attr("content");
+     const csrfAttrs = { type: "hidden" };
+     [[csrfAttrs.name, csrfAttrs.value]] = Object.entries(OSM.csrf);
  
      $("<input>")
-       .attr("name", csrf_param)
-       .attr("value", csrf_token)
-       .attr("type", "hidden")
+       .attr(csrfAttrs)
        .appendTo($form);
  
      const args = {