From 14a70b4425a823fbcf0d04cb2470d38e9bc0e583 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 4 Apr 2024 13:50:37 +0000
Subject: [PATCH] fixes #3949
Closes #3949
Merge request studip/studip!2806
---
app/controllers/course/courseware.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php
index 22b124b133b..f0b873a2014 100644
--- a/app/controllers/course/courseware.php
+++ b/app/controllers/course/courseware.php
@@ -52,22 +52,20 @@ class Course_CoursewareController extends CoursewareController
public function courseware_action($unit_id = null): void
{
- global $user;
-
Navigation::activateItem('course/courseware/unit');
if ($this->unitsNotFound) {
PageLayout::postMessage(MessageBox::info(_('Es wurde kein Lernmaterial gefunden.')));
return;
}
+ $user = User::findCurrent();
$this->setCoursewareSidebar();
- $this->user_id = $user->id;
/** @var array<mixed> $last */
- $last = UserConfig::get($this->user_id)->getValue('COURSEWARE_LAST_ELEMENT');
+ $last = UserConfig::get($user->id)->getValue('COURSEWARE_LAST_ELEMENT');
$lastStructuralElement = \Courseware\StructuralElement::findOneById($last);
if ($unit_id === null) {
- if (isset($lastStructuralElement) && $lastStructuralElement->canVisit(User::findCurrent())) {
+ if (isset($lastStructuralElement) && $lastStructuralElement->canVisit($user)) {
$this->redirectToFirstUnit('course', Context::getId(), $last);
} else {
$this->redirectToFirstUnit('course', Context::getId(), []);
--
GitLab