Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Conflicts:
	htdocs/product/composition/card.php
	htdocs/public/notice.php

htdocs/product/composition/card.php

@@ -71,6 +71,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 {
 	$error = 0;
 	$maxprod = GETPOST("max_prod", 'int');
+
 	for ($i = 0; $i < $maxprod; $i++)
 	{
 		$qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS');

htdocs/public/notice.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 
 define('NOCSRFCHECK', 1);
 define('NOLOGIN', 1);
+define('NOSESSION', 1);
 
 require '../main.inc.php';
 
@@ -41,9 +42,8 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
 }
 else
 {
-	$langs->load("error");
-	$langs->load("other");
+    $langs->loadLangs(array("error", "other"));
 
-	if (GETPOST('transphrase', 'alphanohtml')) print GETPOST('transphrase', 'alphanohtml');
-	if (GETPOST('transkey', 'alphanohtml')) print $langs->trans(GETPOST('transkey', 'alphanohtml'));
+    if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
+    elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
 }