diff --git a/application/Espo/Tools/EmailNotification/Processor.php b/application/Espo/Tools/EmailNotification/Processor.php index a0bc1ccdf7..c73ed83d1c 100644 --- a/application/Espo/Tools/EmailNotification/Processor.php +++ b/application/Espo/Tools/EmailNotification/Processor.php @@ -315,6 +315,8 @@ class Processor return; } + $parent = null; + $parentId = $note->get('parentId'); $parentType = $note->get('parentType'); diff --git a/application/Espo/Tools/EntityManager/EntityManager.php b/application/Espo/Tools/EntityManager/EntityManager.php index e52f5fec18..5ed72c5c89 100644 --- a/application/Espo/Tools/EntityManager/EntityManager.php +++ b/application/Espo/Tools/EntityManager/EntityManager.php @@ -806,6 +806,9 @@ class EntityManager $label = $params['label']; $labelForeign = $params['labelForeign']; + $relationName = null; + $dataRight = null; + if ($linkType === 'manyToMany') { if (!empty($params['relationName'])) { $relationName = $params['relationName']; @@ -1410,9 +1413,9 @@ class EntityManager $this->language->set($entity, 'links', $link, $label); } - if ($linkType !== 'belongsToParent') { - $labelForeign = null; + $labelForeign = null; + if ($linkType !== 'belongsToParent') { if (isset($params['labelForeign'])) { $labelForeign = $params['labelForeign']; } diff --git a/application/Espo/Tools/Export/Processors/Xlsx.php b/application/Espo/Tools/Export/Processors/Xlsx.php index 07a42cecd0..179354efca 100644 --- a/application/Espo/Tools/Export/Processors/Xlsx.php +++ b/application/Espo/Tools/Export/Processors/Xlsx.php @@ -360,6 +360,8 @@ class Xlsx implements Processor $foreignField = $name; $linkName = null; + $foreignScope = null; + if (strpos($name, '_') !== false) { list($linkName, $foreignField) = explode('_', $name); diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.php index 5bbd7d48ea..3bceebd4a4 100644 --- a/application/Espo/Tools/Import/Import.php +++ b/application/Espo/Tools/Import/Import.php @@ -380,8 +380,6 @@ class Import private function importRow(array $attributeList, array $row): ?stdClass { - $id = null; - $params = $this->params; $action = $params->getAction() ?? self::DEFAULT_ACTION; @@ -390,10 +388,10 @@ class Import return null; } - if (in_array($action, [Params::ACTION_CREATE_AND_UPDATE, Params::ACTION_UPDATE])) { - $updateByAttributeList = []; - $whereClause = []; + $updateByAttributeList = []; + $whereClause = []; + if (in_array($action, [Params::ACTION_CREATE_AND_UPDATE, Params::ACTION_UPDATE])) { $updateBy = $params->getUpdateBy(); if (count($updateBy)) { diff --git a/application/Espo/Tools/Notification/NoteHookProcessor.php b/application/Espo/Tools/Notification/NoteHookProcessor.php index 6e90ab341f..a9bf3092b3 100644 --- a/application/Espo/Tools/Notification/NoteHookProcessor.php +++ b/application/Espo/Tools/Notification/NoteHookProcessor.php @@ -128,6 +128,9 @@ class NoteHookProcessor // This is correct. $skipAclCheck = !$note->isAclProcessed(); + $teamIdList = null; + $userIdList = null; + if (!$skipAclCheck) { $teamIdList = $note->getLinkMultipleIdList('teams'); $userIdList = $note->getLinkMultipleIdList('users'); @@ -267,6 +270,8 @@ class NoteHookProcessor return; } + $notifyUserIdList = []; + foreach ($targetTeamIdList as $teamId) { $team = $this->entityManager->getEntity(Team::ENTITY_TYPE, $teamId);