MDL-19808 Converted calls to popup_form()

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 22952587ebfd515547f1f9434d0b042444ecb4e8..562929a12e5c21b03e0810fa95f0328605343dd2 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -206,15 +206,19 @@
                 }
                 $section = $forumcm->sectionnum;
                 if ($forumcm->instance != $forum->id) {
-                    $url = "discuss.php?d=$discussion->id&move=$forumcm->instance&sesskey=".sesskey();
+                    $url = "discuss.php?d=$discussion->id&move=$forumcm->instance&sesskey=".sesskey();
                     $forummenu[$url] = format_string($forumcm->name);
                 }
             }
             if (!empty($forummenu)) {
                 echo "<div style=\"float:right;\">";
-                echo popup_form("$CFG->wwwroot/mod/forum/", $forummenu, "forummenu", "",
-                                 get_string("movethisdiscussionto", "forum"), "", "", true,'self','',NULL,
-                                 get_string('move'),false,true);
+                $select = moodle_select::make_popup_form('', '', $forummenu, 'forummenu');
+                $select->nothinglabel = get_string("movethisdiscussionto", "forum");
+                $select->form->button->text = get_string('move');
+
+                $select->override_option_values($forummenu);
+
+                echo $OUTPUT->select($select);
                 echo "</div>";
             }
         }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 047e30d7c7f11c26381f9645e9b7a50366d5df73..f6d94a869b55f624182dd850b92863fb5e22feb5 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4134,12 +4134,16 @@ function forum_print_rating_menu($postid, $userid, $scale, $myrating=NULL) {
  * @param string $forumtype optional
  */
 function forum_print_mode_form($id, $mode, $forumtype='') {
+    global $OUTPUT;
+    $select = moodle_select::make_popup_form("view.php?f=$id", 'mode', forum_get_layout_modes(), "mode", $mode);
+    $select->nothinglabel = false;
+
     if ($forumtype == 'single') {
         echo '<div class="forummode">';
-        popup_form("view.php?f=$id&amp;mode=", forum_get_layout_modes(), "mode", $mode, "");
+        echo $OUTPUT->select($select);
         echo '</div>';
     } else {
-        popup_form("discuss.php?d=$id&amp;mode=", forum_get_layout_modes(), "mode", $mode, "");
+        echo $OUTPUT->select($select);
     }
 }