From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Dec 2015 15:54:06 +0000 (+0000)
Subject: Use correct title in og:title for pages with no title
X-Git-Tag: live~4564
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/03356be5887ec2075f68e42bf8fa0928fa0ce249?hp=8368f903101031389c7153623c8858a7a6f2de84

Use correct title in og:title for pages with no title

Fixes #1098
---

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index eb1724d93..8b1eb53b6 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -5,7 +5,7 @@ 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)
diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb
index d07a5bd07..523313eaf 100644
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -3,6 +3,10 @@ require "test_helper"
 
 class TitleHelperTest < ActionView::TestCase
   def test_set_title
+    set_title
+    assert_equal "OpenStreetMap", response.header["X-Page-Title"]
+    assert_nil @title
+
     set_title(nil)
     assert_equal "OpenStreetMap", response.header["X-Page-Title"]
     assert_nil @title