Skip to content

Fix(notification): fix missing attachment #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stonebuzz wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −3
Open

Fix(notification): fix missing attachment #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Fix GLIP Stat injection
- Fix missing icon
- Fix missing categories in `reportSunburstTicketByCategories` chart.
- Fix missing attachment from notification

## [1.9.3] - 2026-01-08

Expand Down
7 changes: 4 additions & 3 deletions inc/notificationevent.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
* @param array $options options used
* @param string $label used for debugEvent() (default '')
**/
public static function raiseEvent($event, $item, $options = [], ?CommonDBTM $trigger = null, $label = '')
public static function raiseEvent($event, $item, $options = [], $label = '')

Check failure on line 78 in inc/notificationevent.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.5 - mariadb:11.8 / Continuous integration 

Method PluginMreportingNotificationEvent::raiseEvent() overrides method NotificationEvent::raiseEvent() but misses parameter #5 $label.

Check failure on line 78 in inc/notificationevent.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.2 - mariadb:10.6 / Continuous integration 

Method PluginMreportingNotificationEvent::raiseEvent() overrides method NotificationEvent::raiseEvent() but misses parameter #5 $label.
{
/** @var array $CFG_GLPI */
global $CFG_GLPI;
Expand All @@ -87,7 +87,7 @@

$options['entities_id'] = 0; //New code
$notificationtarget = NotificationTarget::getInstance($item, $event, $options);
if (!$notificationtarget) {
if (!$notificationtarget || !($notificationtarget instanceof PluginMreportingNotificationTargetNotification)) {
return false;
}

Expand All @@ -106,6 +106,7 @@
$notificationtarget->setMode($data['mode']);
$notificationtarget->setEvent($eventClass);
$notificationtarget->clearAddressesList();
$notificationtarget->addDataForTemplate($event, $options);

//Process more infos (for example for tickets)
$notificationtarget->addAdditionnalInfosForTarget();
Expand Down Expand Up @@ -152,7 +153,7 @@
$users_infos,
$options,
),
[],
$notificationtarget->additionalData,
);
} else {
$notificationtarget->getFromDB($target['id']);
Expand Down
Loading