mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 15:32:13 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
589b213fe7
|
@ -443,7 +443,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
|
|||
case 0: // Approver is an individual.
|
||||
$required = $dms->getUser($a["required"]);
|
||||
if (!is_object($required)) {
|
||||
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
|
||||
$reqName = getMLText("unknown_user")." '".$a["required"]."'";
|
||||
}
|
||||
else {
|
||||
$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
|
||||
|
@ -452,7 +452,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
|
|||
case 1: // Approver is a group.
|
||||
$required = $dms->getGroup($a["required"]);
|
||||
if (!is_object($required)) {
|
||||
$reqName = getMLText("unknown_group")." '".$r["required"]."'";
|
||||
$reqName = getMLText("unknown_group")." '".$a["required"]."'";
|
||||
}
|
||||
else {
|
||||
$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
|
||||
|
|
Loading…
Reference in New Issue
Block a user