MDL-19817 Upgraded calls to choose_from_menu

diff --git a/mod/wiki/checklinks.html b/mod/wiki/checklinks.html
index cd931ecd70e8dc1891bc5b66d63549b0bb6f2eaa..cc9674f49c476b5d161ad4e3dc2455f1cd04957d 100644 (file)
--- a/mod/wiki/checklinks.html
+++ b/mod/wiki/checklinks.html
@@ -11,7 +11,7 @@
 <input type="hidden" name="wikipage" value="<?php print $wikipage?>" />
 <?php
   $pagelist=wiki_admin_checklinks_list();
-  choose_from_menu($pagelist, "pagetocheck", $wikipage, "");
+  echo $OUTPUT->select(html_select::make($pagelist, "pagetocheck", $wikipage, false));
 ?>
   <input type="submit" name="proceed" value="<?php print get_string("checklinks","wiki"); ?>" />
 </fieldset>

diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
index 9a9a0a7555b4da5672451616be20db0c2645bc7b..77e9321e36c57bae26db15e7e4a3d19e15211c56 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
+++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
@@ -41,7 +41,7 @@ $ewiki_t["c"]["EWIKIDUMPCSS"] = '
   
 
 function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
-  global $userid, $groupid, $cm, $wikipage, $wiki, $course, $CFG;
+  global $userid, $groupid, $cm, $wikipage, $wiki, $course, $CFG, $OUTPUT;
   #-- return legacy page
   $cont = true;
   $wikiexport = optional_param('wikiexport', '');
@@ -109,7 +109,9 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
         '    <TD align="right">'.get_string("exportformats","wiki").":</TD>\n".
         "    <TD>\n";
   if($wiki->htmlmode!=2) {
-    $ret.= choose_from_menu($exportformats, "exportformats", $exportformatval, "", "", "", true)."\n";
+      $select = html_select::make($exportformats, "exportformats", $exportformatval, false);
+      $select->nothingvalue = '';
+    $ret.= $OUTPUT->select($select)."\n";
   } else {
     $ret.= '<INPUT type="hidden" name="exportformats" value="1" />'.
            get_string("html","wiki");
@@ -133,7 +135,9 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
   if(count($exportdestinations)==1) {
     $ret.='<INPUT type="hidden" name="exportdestinations" value="0" />'.$exportdestinations[0]."\n";
   } else {
-    $ret.=choose_from_menu($exportdestinations, "exportdestinations", $exportdestinationsval, "", "", "", true)."\n";
+      $select = html_select::make($exportdestinations, "exportdestinations", $exportdestinationsval, false);
+      $select->nothingvalue = '';
+    $ret.= $OUTPUT->select($select)."\n";
   }
   $ret.="    </TD>\n".
       "  </TR>\n".      

diff --git a/mod/wiki/revertpages.html b/mod/wiki/revertpages.html
index afef5eb1c9dfa1adda4c5ec55aa99bcfd1284f96..691e3cb76a12633b4f0755ba911bd726a4c945fa 100644 (file)
--- a/mod/wiki/revertpages.html
+++ b/mod/wiki/revertpages.html
@@ -47,7 +47,7 @@ if($err->remark) {
         $operations=array( "lastonly" => get_string("revertlastonly","wiki"),
                            "allsince" => get_string("revertallsince","wiki"),
                            "the" => get_string("revertthe","wiki"));
-        choose_from_menu($operations, "howtooperate", $form->howtooperate, "");
+        echo $OUTPUT->select(html_select::make($operations, "howtooperate", $form->howtooperate, false));
         ?>
     </td>
 </tr>