cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Decode entities in the title

Browse source 
They will get reencoded (if necessary) when they are output. Fixes #764.
This commit is contained in:
Tom Hughes 2014-06-18 09:25:01 +01:00
parent 2ec712d6ea
commit aa00e6b81e
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/title_helper.rb
View file

@ -1,7 +1,11 @@
require 'htmlentities'
module TitleHelper
@@coder = HTMLEntities.new
def set_title(title = false)
if title
@title = title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c")
@title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
response.headers["X-Page-Title"] = t('layouts.project_name.title') + ' | ' + @title
else
@title = title

4
test/helpers/title_helper_test.rb
View file

@ -9,5 +9,9 @@ class TitleHelperTest < ActionView::TestCase
set_title("Test Title")
assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"]
assert_equal "Test Title", @title
set_title("Test & Title")
assert_equal "OpenStreetMap | Test & Title", response.header["X-Page-Title"]
assert_equal "Test & Title", @title
end
end