From ea44b887240c86a07285f0acd598dd42ee494416 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 14 Mar 2024 20:20:32 +0100
Subject: [PATCH] Revert "fixes #3741"
This reverts commit d19fb497c61c62a204a3ec78a2778123fd97bd58.
---
app/views/shared/contacts/range.php | 2 +-
lib/models/OERMaterial.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/shared/contacts/range.php b/app/views/shared/contacts/range.php
index d66c494430f..c61e43ef994 100644
--- a/app/views/shared/contacts/range.php
+++ b/app/views/shared/contacts/range.php
@@ -70,7 +70,7 @@
?>
</td>
</tr>
- <? if ($range_id == $mvv_contact->range_id && ($contact_id ?? null) == $mvv_contact->contact_id) : ?>
+ <? if ($range_id == $mvv_contact->range_id && $contact_id == $mvv_contact->contact_id) : ?>
<tr class="loaded-details nohover">
<?= $this->render_partial('shared/contacts/details', compact('mvv_contact')) ?>
</tr>
diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php
index bf0f8dc0cd7..a023ad1ed6b 100644
--- a/lib/models/OERMaterial.php
+++ b/lib/models/OERMaterial.php
@@ -632,9 +632,9 @@ class OERMaterial extends SimpleORMap
$user['contact_type'] = "oercampus";
}
$user['name'] = $userdata['name'];
- $user['avatar_url'] = $userdata['avatar'] ?? null;
+ $user['avatar_url'] = $userdata['avatar'] ?: null;
$userdata = $user['data'] ? $user['data']->getArrayCopy() : [];
- $userdata['description'] = $userdata['description'] ?? null;
+ $userdata['description'] = $userdata['description'] ?: null;
$user['data'] = $userdata;
$user->store();
--
GitLab