Skip to content

A free open source IT asset/license management system

Better escaping for display_name in API controller

snipe2bee8729e4a5
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index c62e3031f5..44ef39f247 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -155,7 +155,7 @@ class ActionlogsTransformer
'id' => (int) $actionlog->item->id,
'name' => e($actionlog->item->display_name) ?? null,
'type' => e($actionlog->itemType()),
- 'serial' =>e($actionlog->item->serial) ? e($actionlog->item->serial) : null
+ 'serial' => e($actionlog->item->serial) ? e($actionlog->item->serial) : null
] : null,
'location' => ($actionlog->location) ? [
'id' => (int) $actionlog->location->id,
@@ -168,7 +168,7 @@ class ActionlogsTransformer
'action_type' => $actionlog->present()->actionType(),
'admin' => ($actionlog->adminuser) ? [
'id' => (int) $actionlog->adminuser->id,
- 'name' => e($actionlog->adminuser->display_name),
+ 'name' => e($actionlog->adminuser->display_name) ?? null,
'first_name'=> e($actionlog->adminuser->first_name),
'last_name'=> e($actionlog->adminuser->last_name)
] : null,
@@ -180,7 +180,7 @@ class ActionlogsTransformer
] : null,
'target' => ($actionlog->target) ? [
'id' => (int) $actionlog->target->id,
- 'name' => ($actionlog->target->display_name) ?? null,
+ 'name' => e($actionlog->target->display_name) ?? null,
'type' => e($actionlog->targetType()),
] : null,