Merge pull request #1151 from polarbearing/patch-1

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 8cacdf2085a7dbf425406c4c33475ea12ec618e5..88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,11 +1,17 @@
+require "htmlentities"
+

 module TitleHelper
 module TitleHelper

-  def set_title(title = false)
+  def self.coder
+    @coder ||= HTMLEntities.new
+  end
+
+  def set_title(title = nil)

     if title
     if title

-      @title = 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