Fix html encoded urls in symfony layout

PrestaShop · Oct 27, 2023 · 0bcd09e · 0bcd09e
1 parent 455f625
commit 0bcd09e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
@@ -61,7 +61,7 @@
           {% endif %}
         {% endfor %}
 
-        <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ legacy_path('AdminLogin', {'logout' : 1})|escape('html_attr') }}">
+        <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ legacy_path('AdminLogin', {'logout' : 1}) }}">
           <i class="material-icons d-lg-none">power_settings_new</i>
           <span>
             {{ 'Sign out'|trans({}, 'Admin.Navigation.Header') }}

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
@@ -26,11 +26,11 @@
   <p class="component-search-title">{{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}</p>
   {% for quickAccess in this.quickAccesses %}
     <a class="dropdown-item quick-row-link{% if quickAccess.active %} active{% endif %}"
-      href="{{ quickAccess.link|escape('html_attr') }}"
+      href="{{ quickAccess.link }}"
       {% if quickAccess.new_window %} target="_blank"{% endif %}
       data-item="{{ quickAccess.name }}"
       >
-      {{ quickAccess.name|escape('html_attr') }}
+      {{ quickAccess.name }}
   </a>
   {% endfor %}
   <div class="dropdown-divider"></div>
@@ -41,10 +41,10 @@
        data-method="remove"
        data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
        data-rand="{{ random(1, 200) }}"
-       data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+       data-url="{{ this.cleanCurrentUrl }}"
        data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
-       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
-       data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header') }}"
+       data-link="{{ this.currentQuickAccess.name }}"
     >
       <i class="material-icons">remove_circle_outline</i>
       {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
@@ -55,10 +55,10 @@
        href="#"
        data-rand="{{ random(1, 200) }}"
        data-method="add"
-       data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+       data-url="{{ this.cleanCurrentUrl }}"
        data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
-       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-       data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')}}"
+       data-link="{{ this.currentUrlTitle }}"
     >
       <i class="material-icons">add_circle</i>
       {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -31,7 +31,7 @@
   <div class="nav-bar-overflow">
     <div class="logo-container">
       <div class="d-flex align-items-center">
-        <a id="header_logo" class="logo float-left" href="{{ legacy_path(this.defaultTab)|escape('html_attr') }}"></a>
+        <a id="header_logo" class="logo float-left" href="{{ legacy_path(this.defaultTab) }}"></a>
         <span id="shop_version" class="header-version">{{ this.psVersion }}</span>
       </div>
       <div class="logo-container__close js-mobile-menu">

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -30,12 +30,12 @@
     <div class="dropdown-menu">
       {% for quickAccess in this.quickAccesses %}
         <a class="dropdown-item quick-row-link
-          {% if quickAccess.class is defined %}{{ quickAccess.class|escape('html_attr') }}{% endif %}
+          {% if quickAccess.class is defined %}{{ quickAccess.class }}{% endif %}
           {% if quickAccess.active %}active{% endif %}"
-        href="{{ quickAccess.link|escape('html_attr') }}"
+        href="{{ quickAccess.link }}"
         {% if quickAccess.new_window %} target="_blank"{% endif %}
         data-item="{{ quickAccess.name }}"
-        >{{ quickAccess.name|escape('html_attr') }}</a>
+        >{{ quickAccess.name }}</a>
       {% endfor %}
       <div class="dropdown-divider"></div>
       {% if this.currentQuickAccess %}
@@ -45,10 +45,10 @@
            data-method="remove"
            data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
            data-rand="{{ random(1, 200) }}"
-           data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+           data-url="{{ this.cleanCurrentUrl }}"
            data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
-           data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
-           data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
+           data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header') }}"
+           data-link="{{ this.currentQuickAccess.name }}"
         >
           <i class="material-icons">remove_circle_outline</i>
           {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
@@ -59,10 +59,10 @@
            href="#"
            data-rand="{{ random(1, 200) }}"
            data-method="add"
-           data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+           data-url="{{ this.cleanCurrentUrl }}"
            data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
-           data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-           data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
+           data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')}}"
+           data-link="{{ this.currentUrlTitle }}"
         >
           <i class="material-icons">add_circle</i>
           {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig
@@ -48,7 +48,7 @@ and (
 </div>
 {% else %}
 <div class="shop-list">
-  <a class="link" id="header_shopname" href="{{ baseUrl|escape('html_attr') }}" target= "_blank">
+  <a class="link" id="header_shopname" href="{{ baseUrl }}" target= "_blank">
     <i class="material-icons">visibility</i>
     <span>{{ 'View my store'|trans({}, 'Admin.Navigation.Header') }}</span>
   </a>

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/default_layout.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/default_layout.html.twig
@@ -124,7 +124,7 @@
 
       <div class="header-right">
         <div class="shop-list">
-          <a class="link" id="header_shopname" href="{{ ps.baseUrl|escape('html_attr') }}" target= "_blank">
+          <a class="link" id="header_shopname" href="{{ ps.baseUrl }}" target= "_blank">
             <i class="material-icons">visibility</i>
             <span>{{ 'View my store'|trans({}, 'Admin.Navigation.Header') }}</span>
           </a>