Merge branch 'main' into issue-3911issue-3911

1 files changed, 3 insertions, 5 deletions

diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php
index 22b124b..f0b873a 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(), []);