diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index 68f48bb99..d2ffff0a1 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -1344,9 +1344,8 @@ class UserRights
// The bug has been fixed in PHP 7.2, but in case session_regenerate_id()
// fails we just silently ignore the error and keep the same session id...
$old_error_handler = set_error_handler(array(__CLASS__, 'VoidErrorHandler'));
- session_regenerate_id();
- if ($old_error_handler !== null)
- {
+ session_regenerate_id(true);
+ if ($old_error_handler !== null) {
set_error_handler($old_error_handler);
}
}
diff --git a/js/breadcrumb.js b/js/breadcrumb.js
index e8fc88a6f..ab0941d86 100644
--- a/js/breadcrumb.js
+++ b/js/breadcrumb.js
@@ -59,24 +59,25 @@ $(function()
var oEntry = aBreadCrumb[iEntry];
if (oEntry['label'].length > 0)
{
- var sIconSpec = '';
- if (oEntry['icon'].length > 0)
- {
- sIconSpec = '';
- }
- var sTitle = oEntry['description'];
+ var sIconSpec = '';
+ if (oEntry['icon'].length > 0) {
+ sIconSpec = '
';
+ }
+
+ var sTitle = oEntry['description'],
+ sLabel = oEntry['label'];
if (sTitle.length == 0) {
sTitle = oEntry['label'];
}
- if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length - 1))
- {
+ sTitle = SanitizeHtml(sTitle);
+ sLabel = SanitizeHtml(sLabel);
+
+ if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length-1)) {
// Last entry is the current page
- sBreadCrumbHtml += '