From fdb848d5bb20b230bbd6dddbd2d493cf5d6de4da Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 4 Feb 2019 14:43:57 +0100 Subject: [PATCH] fix list of menuitems, fix user in protocol log --- views/bootstrap/class.Bootstrap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 8ba4241c6..d54ee4d7a 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -50,6 +50,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { /* We still need unsafe-eval, because printDocumentChooserHtml and * printFolderChooserHtml will include a javascript file with ajax * which is evaluated by jquery + * worker-src blob: is needed for cytoscape * X-WebKit-CSP is deprecated, Chrome understands Content-Security-Policy * since version 25+ * X-Content-Security-Policy is deprecated, Firefox understands @@ -595,7 +596,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);; if ($this->params['enableusersview']){ $menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users'); - $menuitems['users'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups'); + $menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups'); } /* Check if hook exists because otherwise callHook() will override $menuitems */ @@ -2597,7 +2598,7 @@ $(document).ready(function() { echo ""; echo "".$rec['date']." - "; $updateuser = $dms->getUser($rec["userID"]); - if(!is_object($required)) + if(!is_object($updateuser)) echo getMLText("unknown_user"); else echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");