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

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index b446282486ab54ec724a788370dba53f562fe46e..16470343656a1880a25eae74e6be6ba4c6417f38 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,15 +1,15 @@
-require "htmlentities"
-

 module TitleHelper
 module TitleHelper

-  @@coder = HTMLEntities.new
+  def self.coder
+    @coder ||= HTMLEntities.new
+  end

 
 

-  def set_title(title = false)
+  def set_title(title = nil)

     if title
     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
     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
     end
   end
 end