question MDL-20910 Fixed buggy conversion of link_to_popup_window

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 1c63909e9c6041efb2d1d83f838a2ae88205f736..7559e1dacd5c569942ee1db3cec8454d52f6405a 100644 (file)
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -1128,7 +1128,9 @@ class default_questiontype {
             if ($state->id == $st->id) {
                 $link = '<b>' . $st->seq_number . '</b>';
             } else if (isset($options->questionreviewlink)) {
-                $link = html_link::make("$options->questionreviewlink?state=$st->id&question=$question->id", $st->seq_number);
+                $reviewlink = new moodle_url($options->questionreviewlink);
+                $reviewlink->params(array('state'=>$st->id,'question'=>$question->id));
+                $link = html_link::make($reviewlink, $st->seq_number);
                 $link->add_action(new popup_action('click', $link->url, 'reviewquestion', array('height' => 450, 'width' => 650)));
                 $link->title = $strreviewquestion;
                 $link = $OUTPUT->link($link);