fixes #4222

Closes #4222

Merge request studip/studip!3053

2 files changed, 6 insertions, 11 deletions

diff --git a/lib/navigation/BrowseNavigation.php b/lib/navigation/BrowseNavigation.php
index 8a89d6c..7faf0c6 100644
--- a/lib/navigation/BrowseNavigation.php
+++ b/lib/navigation/BrowseNavigation.php
@@ -22,14 +22,10 @@ class BrowseNavigation extends Navigation
      */
     public function __construct()
     {
-        global $user, $perm;
+        global $perm;
 
         $courselink = null;
-        // check if logged in
-        $coursetext = '';
-        $courseinfo = '';
-        $courselink = null;
-        if (is_object($user) && $user->id != 'nobody') {
+        if (User::findCurrent()) {
             $coursetext = _('Veranstaltungen');
             $courseinfo = _('Meine Veranstaltungen & Einrichtungen');
 
@@ -37,14 +33,15 @@ class BrowseNavigation extends Navigation
                 $courselink = 'dispatch.php/admin/courses';
             }
         } else {
-            $coursetext = _('Freie');
+            $coursetext = _('Freie Veranstaltungen');
             $courseinfo = _('Freie Veranstaltungen');
             $courselink = 'dispatch.php/public_courses';
         }
 
         parent::__construct($coursetext, $courselink);
+
         if (!Context::getId()) {
-            $this->setImage(Icon::create('seminar', 'navigation', ["title" => $courseinfo]));
+            $this->setImage(Icon::create('seminar', Icon::ROLE_NAVIGATION, ['title' => $courseinfo]));
         }
     }
 
diff --git a/lib/navigation/CourseNavigation.php b/lib/navigation/CourseNavigation.php
index a22b89e..7db8019 100644
--- a/lib/navigation/CourseNavigation.php
+++ b/lib/navigation/CourseNavigation.php
@@ -28,15 +28,13 @@ class CourseNavigation extends Navigation
 
         $this->range = $range;
 
-        global $user;
-
         // check if logged in
         if (User::findCurrent()) {
             $coursetext = _('Veranstaltungen');
             $courseinfo = _('Meine Veranstaltungen & Einrichtungen');
             $courselink = 'dispatch.php/my_courses';
         } else {
-            $coursetext = _('Freie');
+            $coursetext = _('Freie Veranstaltungen');
             $courseinfo = _('Freie Veranstaltungen');
             $courselink = 'dispatch.php/public_courses';
         }