FIX: Issue #876: Context menu in header near top right empty and show…

…ing for non-logged in users and students.
gjb2048 · Nov 25, 2018 · 8af218d · 8af218d
1 parent 14dfc44
commit 8af218d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,7 @@
 New in 3.5.1.2
 ==============
 - FIX: Position of quiz correction icons.
+- FIX: Issue #876: Context menu in header near top right empty and showing for non-logged in users and students.
 - FIX: Issue #882: badgesmi setting missing in settings.php.
 - FIX: Issue #884: Removed important font size declarations from responsive.less.  Thanks to Mike Nodding for the patch.
 - NEW: H5P Custom CSS setting in 'Features' for the H5P module (https://moodle.org/plugins/mod_hvp) if installed.

diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
@@ -506,11 +506,12 @@ public function context_header_settings_menu() {
             }
         }
 
-        if (($showfrontpagemenu) || ($showcoursemenu) || ($showusermenu)) {
-            return $this->render_navbar_action_menu($menu, $title);
-        } else {
+        if ($menu->is_empty()) {
             return '';
+        } else if (($showfrontpagemenu) || ($showcoursemenu) || ($showusermenu)) {
+            return $this->render_navbar_action_menu($menu, $title);
         }
+        return '';
     }
 
     /**