From d9f51ad880d11949272d56c68ece4c889e8f529a Mon Sep 17 00:00:00 2001 From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de> Date: Wed, 23 Aug 2023 10:18:52 +0000 Subject: [PATCH] return default if content_terms_of_use_id is not set, fixes #3085 Closes #3085 Merge request studip/studip!2068 --- lib/classes/JsonApi/Schemas/FileRef.php | 2 +- lib/classes/JsonApi/Schemas/LibraryFile.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/classes/JsonApi/Schemas/FileRef.php b/lib/classes/JsonApi/Schemas/FileRef.php index d979537ed88..1fc6fdd9873 100644 --- a/lib/classes/JsonApi/Schemas/FileRef.php +++ b/lib/classes/JsonApi/Schemas/FileRef.php @@ -179,7 +179,7 @@ class FileRef extends SchemaProvider private function addTermsRelationship(array $relationships, \FileRef $resource) { $relationships[self::REL_TERMS] = [ - self::RELATIONSHIP_DATA => $resource->content_terms_of_use_id ? $resource->terms_of_use : null, + self::RELATIONSHIP_DATA => $resource->terms_of_use, self::RELATIONSHIP_LINKS_SELF => true, ]; diff --git a/lib/classes/JsonApi/Schemas/LibraryFile.php b/lib/classes/JsonApi/Schemas/LibraryFile.php index febcc100f62..b3fa065d824 100644 --- a/lib/classes/JsonApi/Schemas/LibraryFile.php +++ b/lib/classes/JsonApi/Schemas/LibraryFile.php @@ -180,7 +180,7 @@ class LibraryFile extends SchemaProvider private function addTermsRelationship(array $relationships, \FileRef $resource) { $relationships[self::REL_TERMS] = [ - self::RELATIONSHIP_DATA => $resource->content_terms_of_use_id ? $resource->terms_of_use : null, + self::RELATIONSHIP_DATA => $resource->terms_of_use, self::RELATIONSHIP_LINKS_SELF => true, ]; -- GitLab