MDL-19794 Upgraded calls to choose_from_menu_nested

diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index c91ac2520f1fc3ddcc428426b961c2c1f635379f..45571572b3ccd38c37f3cea02726ff72c445c666 100644 (file)
--- a/course/report/log/lib.php
+++ b/course/report/log/lib.php
@@ -221,7 +221,9 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
     echo "<input type=\"hidden\" name=\"showcourses\" value=\"$showcourses\" />\n";
     if (has_capability('coursereport/log:view', $sitecontext) && $showcourses) {
         $cid = empty($course->id)? '1' : $course->id; 
-        choose_from_menu_nested($dropdown, "host_course", $hostid.'/'.$cid, "");
+        $select = moodle_select::make($dropdown, "host_course", $hostid.'/'.$cid);
+        $select->nested = true;
+        echo $OUTPUT->select($select);
     } else {
         $courses = array();
         $courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : '');

diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 26a2dc6aacd2249439a1600e62808e9a114ab991..1a63b90e29758c19761e0ecadde8ab5162b7dc38 100644 (file)
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -117,7 +117,9 @@
     echo '<form class="participationselectform" action="index.php" method="get"><div>'."\n".
          '<input type="hidden" name="id" value="'.$course->id.'" />'."\n";
     echo '<label for="menuinstanceid">'.get_string('activitymodule').'</label>'."\n";
-    choose_from_menu_nested($instanceoptions,'instanceid',$instanceid);
+    $select = moodle_select::make($instanceoptions, 'instanceid', $instanceid);
+    $select->nested = true;
+    echo $OUTPUT->select($select);
     echo '<label for="menutimefrom">'.get_string('lookback').'</label>'."\n";
     choose_from_menu($timeoptions,'timefrom',$timefrom);
     echo '<label for="menuroleid">'.get_string('showonly').'</label>'."\n";