]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #6717: Do not double html-encode page titles (#6720)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 10 Mar 2018 10:43:20 +0000 (11:43 +0100)
committerGitHub <noreply@github.com>
Sat, 10 Mar 2018 10:43:20 +0000 (11:43 +0100)
app/views/layouts/application.html.haml

index b26d2c5091e74fed3b815193cb088ffef1ce51df..df898d5a20bb33759e8bc66896a547fcb6d93aec 100755 (executable)
@@ -11,7 +11,7 @@
     %meta{ name: 'theme-color', content: '#282c37' }/
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
-    %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp, ' - ', title]) : title
+    %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
 
     = stylesheet_pack_tag 'common', media: 'all'
     = stylesheet_pack_tag current_theme, media: 'all'