From c98881671b916353f8707e5d0cd235703ecc6deb Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Wed, 27 Jan 2021 11:13:52 +0100
Subject: [PATCH] Fix name of files : in order to manage the use of "&"
 character in url

---
 templates/pages/backoffice/ajaxpage/layout.html.twig | 4 ++--
 templates/pages/backoffice/webpage/layout.html.twig  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig
index 66b6450b8..e3a1e3977 100644
--- a/templates/pages/backoffice/ajaxpage/layout.html.twig
+++ b/templates/pages/backoffice/ajaxpage/layout.html.twig
@@ -29,8 +29,8 @@
 				{% for sJsFile in aPage.aJsFiles %}
 					if (! $.inArray('{{ sJsFile|raw }}',aListJsFiles))
 					{
-						aFilesToLoad{{ sId }}.push('{{ sJsFile|add_itop_version }}');
-						aListJsFiles.push("{{ sJsFile }}");
+						aFilesToLoad{{ sId }}.push('{{ sJsFile|raw|add_itop_version }}');
+						aListJsFiles.push("{{ sJsFile|raw }}");
 					}
 				{% endfor %}
 				var iCurrentIdx{{ sId }} = 0;
diff --git a/templates/pages/backoffice/webpage/layout.html.twig b/templates/pages/backoffice/webpage/layout.html.twig
index c8eb42bcc..0e45290c4 100644
--- a/templates/pages/backoffice/webpage/layout.html.twig
+++ b/templates/pages/backoffice/webpage/layout.html.twig
@@ -12,7 +12,7 @@
     {% endif %}
     <title>{{ aPage.sTitle }}</title>
     {% if aPage.sFaviconUrl is defined %}
-        <link rel="shortcut icon" href="{{ aPage.sFaviconUrl|add_itop_version }}">
+        <link rel="shortcut icon" href="{{ aPage.sFaviconUrl|raw|add_itop_version }}">
     {% endif %}
     <link rel="search" type="application/opensearchdescription+xml" title="iTop" href="{{ aPage.sAbsoluteUrlAppRoot }}pages/opensearch.xml.php">
 
@@ -22,7 +22,7 @@
     {% block iboPageCssFiles %}
 	    {% for aCssFileData in aPage.aCssFiles %}
 		    {% if aCssFileData['condition'] != '' %}<!--[if {{ aCssFileData['condition'] }}]>{% endif %}
-			<link type="text/css" href="{{ aCssFileData['link']|add_itop_version }}" rel="stylesheet">
+			<link type="text/css" href="{{ aCssFileData['link']|raw|add_itop_version }}" rel="stylesheet">
 			{% if aCssFileData['condition'] != '' %}<![endif]-->{% endif %}
 	    {% endfor %}
     {% endblock %}
@@ -62,7 +62,7 @@
 </script>
 {% block iboPageJsFiles %}
     {% for sJsFile in aPage.aJsFiles %}
-        <script type="text/javascript" src="{{ sJsFile|add_itop_version }}"></script>
+        <script type="text/javascript" src="{{ sJsFile|raw|add_itop_version }}"></script>
     {% endfor %}
 {% endblock %}