From b98fb9032c3d015a5a469f6a4533d5c9ec856c91 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 22 Jun 2023 14:19:51 +0800
Subject: [PATCH] MDL-78550 grade: Avoid rendering an empty <h2> heading

---
 grade/lib.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/grade/lib.php b/grade/lib.php
index f069d54da72..94e5d799397 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -970,15 +970,13 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
 
     $output = '';
     // Add a help dialogue box if provided.
-    if (isset($headerhelpidentifier)) {
+    if (isset($headerhelpidentifier) && !empty($heading)) {
         $output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent);
-    } else {
-        if (isset($user)) {
-            $renderer = $PAGE->get_renderer('core_grades');
-            $output = $OUTPUT->heading($renderer->user_heading($user, $courseid));
-        } else {
-            $output = $OUTPUT->heading($heading);
-        }
+    } else if (isset($user)) {
+        $renderer = $PAGE->get_renderer('core_grades');
+        $output = $OUTPUT->heading($renderer->user_heading($user, $courseid));
+    } else if (!empty($heading)) {
+        $output = $OUTPUT->heading($heading);
     }
 
     if ($return) {