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

[rails.git] / app / helpers / social_share_button_helper.rb

diff --git a/app/helpers/social_share_button_helper.rb b/app/helpers/social_share_button_helper.rb
index 90618a9245662a3975fee24f114f06ddd963d170..13a9f9e9ea0c6be158bc8677bd6e7533ee96543a 100644 (file)
--- a/app/helpers/social_share_button_helper.rb
+++ b/app/helpers/social_share_button_helper.rb
@@ -16,7 +16,7 @@ module SocialShareButtonHelper
     tag.div(
       :class => "social-share-button d-flex gap-1 align-items-end flex-wrap mb-3"
     ) do
-      SOCIAL_SHARE_CONFIG.map do |site, icon|
+      safe_join(SOCIAL_SHARE_CONFIG.map do |site, icon|
         link_options = {
           :rel => "nofollow",
           :class => "ssb-icon rounded-circle",
@@ -27,7 +27,7 @@ module SocialShareButtonHelper
         link_to generate_share_url(site, title, url), link_options do
           image_tag(icon, :alt => I18n.t("application.share.#{site}.alt"), :size => 28)
         end
-      end.join.html_safe
+      end, "\n")
     end
   end
 
@@ -35,8 +35,8 @@ module SocialShareButtonHelper
 
   def generate_share_url(site, title, url)
     site = site.to_sym
-    title = URI.encode_www_form_component(title)
-    url = URI.encode_www_form_component(url)
+    title = URI.encode_uri_component(title)
+    url = URI.encode_uri_component(url)
 
     case site
     when :email