MDL-19809 Upgraded calls to choose_from_menu

diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index e29bbd4e04be04492b3de82af4659300e81fb4c9..f7557732a5bd297ef0fd36473c29a65488fa2e5d 100644 (file)
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -77,7 +77,7 @@
         //Sort it
         asort($formats);
 
-        choose_from_menu($formats,'popupformatname',$displayformat->popupformatname);
+        echo $OUTPUT->select(html_select::make($formats,'popupformatname',$displayformat->popupformatname));
      ?>
         </td>
         <td width="60%">

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 84466143e990bd13a6408dd19ebce7c014d139dd..b2e6986cf709f7f3b1c8563f34d317cd9db2f777 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -2299,7 +2299,7 @@ function glossary_get_ratings_summary($entryid, $scale, $ratings=NULL) {
  * @param array $scale
  */
 function glossary_print_rating_menu($entryid, $userid, $scale) {
-    global $DB;
+    global $DB, $OUTPUT;
 
     static $strrate;
 
@@ -2310,8 +2310,10 @@ function glossary_print_rating_menu($entryid, $userid, $scale) {
     if (empty($strrate)) {
         $strrate = get_string("rate", "glossary");
     }
+    $select = html_select::make($scale, $entryid, $rating->rating, "$strrate...");
+    $select->nothingvalue = '-999';
 
-    choose_from_menu($scale, $entryid, $rating->rating, "$strrate...",'',-999);
+    echo $OUTPUT->select($select);
 }
 
 /**