Merge branch 'MDL-79467-401' of https://github.com/paulholden/moodle …

…into MOODLE_401_STABLE
moodle · Sep 27, 2023 · a76f40c · a76f40c
2 parents 4f8a492 + 282523b
commit a76f40c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -1405,7 +1405,7 @@ public function set_title($title, bool $appendsitename = true) {
                 $sitenamedisplay = $CFG->sitenameintitle;
             }
             $site = get_site();
-            if (empty(trim($site->{$sitenamedisplay}))) {
+            if (empty(trim($site->{$sitenamedisplay} ?? ''))) {
                 // If for some reason the site name is not yet set, fall back to 'Moodle'.
                 $title .= self::TITLE_SEPARATOR . 'Moodle';
             } else {