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

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index b446282486ab54ec724a788370dba53f562fe46e..93f1b9ea5d1ea215bd9c13bfc5e9191acd6dd4aa 100644 (file)
--- 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 = nil)
+    project_title = t("layouts.project_name.title")
 
-  def set_title(title = false)
     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} | #{project_title}")
     else
       @title = title
-      response.headers["X-Page-Title"] = t("layouts.project_name.title")
+      response.headers["X-Page-Title"] = ERB::Util.u(project_title)
     end
   end
 end