EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsovaa6c323ecf13
diff --git a/application/Espo/Resources/defaults/config.php b/application/Espo/Resources/defaults/config.phpindex 137d57b854..36abc933d4 100644--- a/application/Espo/Resources/defaults/config.php+++ b/application/Espo/Resources/defaults/config.php@@ -54,7 +54,7 @@ return ['recordsPerPageSelect' => 10,'recordsPerPageKanban' => 5,'applicationName' => 'EspoCRM',- 'version' => '@@version',+ 'version' => '9.0.0','timeZone' => 'UTC','dateFormat' => 'DD.MM.YYYY','timeFormat' => 'HH:mm',diff --git a/application/Espo/Tools/Notification/NoteMentionHookProcessor.php b/application/Espo/Tools/Notification/NoteMentionHookProcessor.phpindex 8ca645fc31..d80f05bf11 100644--- a/application/Espo/Tools/Notification/NoteMentionHookProcessor.php+++ b/application/Espo/Tools/Notification/NoteMentionHookProcessor.php@@ -32,7 +32,6 @@ namespace Espo\Tools\Notification;use Espo\Core\Acl;use Espo\Core\Acl\Permission;use Espo\Core\AclManager;-use Espo\Core\Name\Field;use Espo\ORM\EntityManager;use Espo\Entities\User;use Espo\Entities\Note;@@ -60,21 +59,17 @@ class NoteMentionHookProcessorprivate function process(Note $note): void{- $post = $note->getPost() ?? '';-$mentionData = (object) [];$previousMentionList = [];if (!$note->isNew()) {- $previousMentionList = array_keys(- get_object_vars($note->getData()->mentions ?? (object) [])- );+ $previousMentionList = array_keys(get_object_vars($note->getData()->mentions ?? (object) []));}$matches = null;- preg_match_all('/(@[\[email protected]]+)/', $post, $matches);+ preg_match_all('/(@[\[email protected]]+)/', $note->getPost() ?? '', $matches);$mentionCount = 0;@@ -90,7 +85,7 @@ class NoteMentionHookProcessorunset($data->mentions);}- $note->set('data', $data);+ $note->setData($data);}/**@@ -113,9 +108,8 @@ class NoteMentionHookProcessorforeach ($matchList as $item) {$userName = substr($item, 1);- /** @var ?User $user */$user = $this->entityManager- ->getRDBRepository(User::ENTITY_TYPE)+ ->getRDBRepositoryByClass(User::class)->where(['userName' => $userName,'isActive' => true,@@ -132,8 +126,8 @@ class NoteMentionHookProcessor$mentionData->$item = (object) ['id' => $user->getId(),- 'name' => $user->get(Field::NAME),- 'userName' => $user->get('userName'),+ 'name' => $user->getName(),+ 'userName' => $user->getUserName(),'_scope' => $user->getEntityType(),];