fix and improve ability coverage to account for tokens

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index eb1724d93aac343ae23a559111b7317a3b4785fd..88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -5,13 +5,13 @@ module TitleHelper
     @coder ||= HTMLEntities.new
   end
 
-  def set_title(title = false)
+  def set_title(title = nil)
     if 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)
+      response.headers["X-Page-Title"] = ERB::Util.u(@title + " | " + t("layouts.project_name.title"))
     else
       @title = title
-      response.headers["X-Page-Title"] = URI.escape(t("layouts.project_name.title"))
+      response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title"))
     end
   end
 end