X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..48e886784e742ec28e33c32b3a0e0bf7cf6d21e7:/app/helpers/title_helper.rb?ds=inline

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index b44628248..88a5a2a74 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,15 +1,17 @@
 require "htmlentities"
 
 module TitleHelper
-  @@coder = HTMLEntities.new
+  def self.coder
+    @coder ||= HTMLEntities.new
+  end
 
-  def set_title(title = false)
+  def set_title(title = nil)
     if title
-      @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
-      response.headers["X-Page-Title"] = t("layouts.project_name.title") + " | " + @title
+      @title = TitleHelper.coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
+      response.headers["X-Page-Title"] = ERB::Util.u(@title + " | " + t("layouts.project_name.title"))
     else
       @title = title
-      response.headers["X-Page-Title"] = t("layouts.project_name.title")
+      response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title"))
     end
   end
 end