Merge branch 'pull/843' into titles
[rails.git] / app / helpers / title_helper.rb
index e72069ff013a6a51308341f3ca2643f50b2db35a..88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9 100644 (file)
@@ -1,15 +1,17 @@
-require 'htmlentities'
+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"] = @title + ' | ' + t('layouts.project_name.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