From 7b872489628f0157fb940c1ab0c01f26994455d1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 26 Jan 2023 13:09:09 +0000
Subject: [PATCH] prevent warning in
CourseWare\StructuralElement::hasEditingPermission(), fixes #2070
Closes #2070
Merge request studip/studip!1346
---
lib/models/Courseware/StructuralElement.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php
index dbe2e62581d..ba5123883a3 100644
--- a/lib/models/Courseware/StructuralElement.php
+++ b/lib/models/Courseware/StructuralElement.php
@@ -373,9 +373,9 @@ class StructuralElement extends \SimpleORMap
*/
public function hasEditingPermission($user): bool
{
- return $GLOBALS['perm']->have_perm('root', $user->id) ||
- $GLOBALS['perm']->have_studip_perm(
- \CourseConfig::get($this->range_id)->COURSEWARE_EDITING_PERMISSION[$this->getCoursewareCourse($this->range_id)->id],
+ return $GLOBALS['perm']->have_perm('root', $user->id)
+ || $GLOBALS['perm']->have_studip_perm(
+ \CourseConfig::get($this->range_id)->COURSEWARE_EDITING_PERMISSION[$this->getCoursewareCourse($this->range_id)->id] ?? 'tutor',
$this->range_id,
$user->id
);
@@ -661,7 +661,7 @@ class StructuralElement extends \SimpleORMap
$root = $this->findAncestors()[0];
}
- return Unit::findOneBySQL('structural_element_id = ?', [$root->id]);
+ return Unit::findOneBySQL('structural_element_id = ?', [$root->id]);
}
/**
--
GitLab