Merge branch 'MDL-73584-master' of https://github.com/sarjona/moodle

course/classes/management_renderer.php

@@ -378,6 +378,10 @@ class core_course_management_renderer extends plugin_renderer_base {
         if (!$hasitems) {
             return '';
         }
+
+        // If the action menu has items, add the menubar role to the main element containing it.
+        $menu->attributes['role'] = 'menubar';
+
         return $this->render($menu);
     }
 

lib/outputcomponents.php

@@ -4250,7 +4250,6 @@ class action_menu implements renderable, templatable {
         $this->attributesprimary = array(
             'id' => 'action-menu-'.$this->instance.'-menubar',
             'class' => 'menubar',
-            'role' => 'menubar'
         );
         $this->attributessecondary = array(
             'id' => 'action-menu-'.$this->instance.'-menu',