From 5cab6be8b09cea408789811c0909dd46ef97db74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Thu, 26 Apr 2018 09:40:06 +0200
Subject: [PATCH] [27544] Avoid self-closing tag on html5 custom element

https://community.openproject.com/wp/27544
---
 app/views/projects/form/_project_attributes.html.erb          | 4 ++--
 .../text_formatting/formatters/markdown/helper.rb             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/form/_project_attributes.html.erb b/app/views/projects/form/_project_attributes.html.erb
index 88ba1ce877..816f68fe2e 100644
--- a/app/views/projects/form/_project_attributes.html.erb
+++ b/app/views/projects/form/_project_attributes.html.erb
@@ -62,7 +62,7 @@ See docs/COPYRIGHT.rdoc for more details.
 <% end %>
 
 <% unless form.object.errors[:identifier].blank? %>
-  <script type="text/javascript">
+  <%= nonced_javascript_tag do %>
     jQuery('#advanced-settings > .advanced-settings-inner').show();
-  </script>
+  <% end %>
 <% end %>
diff --git a/lib/open_project/text_formatting/formatters/markdown/helper.rb b/lib/open_project/text_formatting/formatters/markdown/helper.rb
index 60ac30d23b..cb02e8c6c7 100644
--- a/lib/open_project/text_formatting/formatters/markdown/helper.rb
+++ b/lib/open_project/text_formatting/formatters/markdown/helper.rb
@@ -39,7 +39,7 @@ module OpenProject::TextFormatting::Formatters
       end
 
       def wikitoolbar_for(field_id)
-        tag 'op-ckeditor-form', 'textarea-selector': "##{field_id}"
+        content_tag 'op-ckeditor-form', '', 'textarea-selector': "##{field_id}"
       end
 
       def initial_page_content(_page)