Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-02-05 10:56:27 +01:00
commit 92949d8887
3 changed files with 4 additions and 0 deletions

View File

@ -148,6 +148,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($status);
$params['new_status_code'] = $status;
$params['comment'] = $document->getComment();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;

View File

@ -95,6 +95,8 @@ if ($overrideStatus != $overallStatus["status"]) {
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($overrideStatus);
$params['new_status_code'] = $overrideStatus;
$params['old_status_code'] = $overallStatus["status"];
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;

View File

@ -143,6 +143,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getReviewStatusText(S_REJECTED);
$params['new_status_code'] = S_REJECTED;
$params['username'] = $user->getFullName();
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $settings->_siteName;