Merge pull request #6285 in DEV/moodle from feature/INT-18610_creative-mouse to release/4.0+1

* commit 'e352cfc9870c215b2d9303e436c530ba4e5ade80':
  INT-18610: Fixes for missing scenarios in the VPAT report from the QA vendor session

Author: Rafael Becerra

lib.php

@@ -5672,8 +5672,6 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
     $groupselect = groups_print_activity_menu($cm, $urlmenu, true);
 
     $sortselect = '';
-    $sortbysronlytextstring = get_string('sortdiscussionsbysronlytext', 'hsuforum');
-    $sortbysronlytext = '<a class="sr-only" href="#"><span>'.$sortbysronlytextstring.'</span></a>';
     if ($discussions && $forum->type != 'single' && $numdiscussions > 1) {
         require_once(__DIR__.'/lib/discussion/sort.php');
         $dsort = hsuforum_lib_discussion_sort::get_from_session($forum, $context);
@@ -5686,7 +5684,6 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
     if ($groupselect || $sortselect && $forum->type != 'blog') {
         echo "<div id='hsuforum-filter-options'>";
         echo $groupselect;
-        echo $sortbysronlytext;
         echo $sortselect;
         echo "</div>";
     }

renderer.php

@@ -1200,13 +1200,16 @@ public function discussion_subscribe_link($cm, $discussion, hsuforum_lib_discuss
     public function discussion_sorting($cm, hsuforum_lib_discussion_sort $sort) {
 
         $url = new moodle_url('/mod/hsuforum/view.php');
+        $sortbysronlytextstring = get_string('sortdiscussionsbysronlytext', 'hsuforum');
+        $sortbysronlytext = '<span class="sr-only">'.$sortbysronlytextstring.'</span>';
 
         $sortselect = html_writer::select($sort->get_key_options_menu(), 'dsortkey', $sort->get_key(), false, array('class' => ''));
         $sortform = "<form method='get' action='$url' class='hsuforum-discussion-sort'>
                     <legend class='accesshide'>".get_string('sortdiscussions', 'hsuforum')."</legend>
                     <input type='hidden' name='id' value='{$cm->id}'>
                     <label for='dsortkey' class='accesshide'>".get_string('orderdiscussionsby', 'hsuforum')."</label>
                     $sortselect
+                    $sortbysronlytext
                     <input type='submit' class='btn btn-secondary' value='".get_string('sortdiscussionsby', 'hsuforum')."'>
                     </form>";