Update to iD v1.7.2

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index a1a2125a173f81a72f2b53dcdccecdb3b9322e3f..eb1724d93aac343ae23a559111b7317a3b4785fd 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,15 +1,17 @@
-require 'htmlentities'
+require "htmlentities"

 
 module TitleHelper
 
 module TitleHelper

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

 
   def set_title(title = false)
     if 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"] = URI.escape(t("layouts.project_name.title") + " | " + @title)

     else
       @title = title
     else
       @title = title

-      response.headers["X-Page-Title"] = t('layouts.project_name.title')
+      response.headers["X-Page-Title"] = URI.escape(t("layouts.project_name.title"))

     end
   end
 end
     end
   end
 end