MDL-76362 core: Test coursealias before using

moodle · Jan 23, 2023 · de4de9c · de4de9c
1 parent ddf0f08
commit de4de9c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/accesslib.php b/lib/accesslib.php
@@ -4519,15 +4519,15 @@ function role_get_name(stdClass $role, $context = null, $rolenamedisplay = ROLEN
     }
 
     if ($rolenamedisplay == ROLENAME_ALIAS) {
-        if ($coursecontext and trim($role->coursealias ?? '') !== '') {
+        if ($coursecontext && $role->coursealias && trim($role->coursealias) !== '') {
             return format_string($role->coursealias, true, array('context'=>$coursecontext));
         } else {
             return $original;
         }
     }
 
     if ($rolenamedisplay == ROLENAME_BOTH) {
-        if ($coursecontext and trim($role->coursealias ?? '') !== '') {
+        if ($coursecontext && $role->coursealias && trim($role->coursealias) !== '') {
             return format_string($role->coursealias, true, array('context'=>$coursecontext)) . " ($original)";
         } else {
             return $original;