fix(core) Fix escaping of cookies warning message

issue #6071

fix(core) Fix escaping of cookies warning message
issue #6071
8213c0a6 · Côme Chilliet · 4c87428e · 8213c0a6 · 8213c0a6 · 8213c0a6
Unverified Commit 8213c0a6 authored 4 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 5 deletions
+2 -5
--- a/ihtml/themes/breezy/login.tpl
+++ b/ihtml/themes/breezy/login.tpl
@@ -53,7 +53,7 @@
        if (document.cookie.indexOf( "fdtest=") > -1 )
          document.cookie = "fdtest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
        else
-          document.write("{$cookies}");
+          document.write("<b>{t}Warning{/t}</b> {t}Your browser has cookies disabled. Please enable cookies and reload this page before logging in!{/t}");
        -->
       </script>
      </p>

--- a/ihtml/themes/legacy/login.tpl
+++ b/ihtml/themes/legacy/login.tpl
@@ -53,7 +53,7 @@
        if (document.cookie.indexOf( "fdtest=") > -1 )
          document.cookie = "fdtest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
        else
-          document.write("{$cookies}");
+          document.write("<b>{t}Warning{/t}</b> {t}Your browser has cookies disabled. Please enable cookies and reload this page before logging in!{/t}");
        -->
       </script>
      </p>

--- a/include/login/class_LoginPost.inc
+++ b/include/login/class_LoginPost.inc
@@ -84,9 +84,6 @@ class LoginPost extends LoginMethod
      }
    }

-    /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-    $smarty->assign('cookies', '<b>'._('Warning').':</b> '._('Your browser has cookies disabled. Please enable cookies and reload this page before logging in!'));
-
    static::displayLogin();
  }