gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-31 22:17:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of git merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2020-02-26 20:57:40 +01:00
parent 33c4f88636
commit 3d33c1d49c
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
op/op.ReviewDocument.php
View File

@ -175,24 +175,9 @@ if ($newdocstatus['status'] == S_DRAFT_APP) {
if ($dastat["status"] == 0) { if ($dastat["status"] == 0) {
if ($dastat["type"] == 0) { if ($dastat["type"] == 0) {
<<<<<<< HEAD
$approver = $dms->getUser($dastat["required"]); $approver = $dms->getUser($dastat["required"]);
$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params); $notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
} elseif ($dastat["type"] == 1) { } elseif ($dastat["type"] == 1) {
=======
if($notifier) {
$subject = "approval_request_email_subject";
$message = "approval_request_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $version;
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
foreach ($docApprovalStatus as $dastat) {
>>>>>>> seeddms-5.1.x
$group = $dms->getGroup($dastat["required"]); $group = $dms->getGroup($dastat["required"]);
$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params); $notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);