mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 07:22:11 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
bd80e96c92
|
@ -298,6 +298,7 @@
|
|||
- do not show full list of notifiers to none admins
|
||||
- do not list document/folders in sequence selector if its number exceeds 50
|
||||
- typeahead menu works with arrow keys again, wait 1 sec. before searching
|
||||
- fix sending notification mails when document/folder was moved
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Changes in version 5.1.33
|
||||
|
|
|
@ -914,7 +914,7 @@ class SeedDMS_NotificationService {
|
|||
// if user is not owner and owner not already in list of notifiers, then
|
||||
// send notification to owner
|
||||
if ($user->getID() != $document->getOwner()->getID() &&
|
||||
false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
|
||||
false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users'])) {
|
||||
$this->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
|
||||
}
|
||||
} /* }}} */
|
||||
|
@ -948,7 +948,7 @@ class SeedDMS_NotificationService {
|
|||
}
|
||||
// if user is not owner send notification to owner
|
||||
if ($user->getID() != $folder->getOwner()->getID() &&
|
||||
false === SeedDMS_Core_DMS::inList($folder->getOwner(), $notifyList['users'])) {
|
||||
false === SeedDMS_Core_DMS::inList($folder->getOwner(), $nl['users'])) {
|
||||
$this->toIndividual($user, $folder->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
|
||||
}
|
||||
} /* }}} */
|
||||
|
|
Loading…
Reference in New Issue
Block a user