mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 13:24:56 +01:00
Code Issues Projects Releases Wiki Activity

MDL-29091 quiz - switch to use moodle_url::out_as_local_url

Browse Source
This commit is contained in:
Dan Poltawski 2011-08-24 15:31:56 +01:00 committed by kordan
parent 34c0d46e94
commit 8e41bae41e
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/quiz/edit.php
View File

@ -559,7 +559,7 @@ if (!$quiz_reordertool) {
$randomform = new quiz_add_random_form(new moodle_url('/mod/quiz/addrandom.php'), $contexts);
$randomform->set_data(array(
'category' => $pagevars['cat'],
'returnurl' => str_replace($CFG->wwwroot, '', $thispageurl->out(false)),
'returnurl' => $thispageurl->out_as_local_url(false),
'cmid' => $cm->id,
));
?>

4
mod/quiz/editlib.php
View File

@ -453,7 +453,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete, $reordertool,
$pageopen = false;
$returnurl = str_replace($CFG->wwwroot, '', $pageurl->out(false));
$returnurl = $pageurl->out_as_local_url(false);
$questiontotalcount = count($order);
foreach ($order as $count => $qnum) {
@ -728,7 +728,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts, $defaultc
$returnurladdtoquiz = new moodle_url($pageurl, array('addonpage' => $page));
// Print a button linking to the choose question type page.
$returnurladdtoquiz = str_replace($CFG->wwwroot, '', $returnurladdtoquiz->out(false));
$returnurladdtoquiz = $returnurladdtoquiz->out_as_local_url(false);
$newquestionparams = array('returnurl' => $returnurladdtoquiz,
'cmid' => $quiz->cmid, 'appendqnumstring' => 'addquestion');
create_new_question_button($defaultcategoryid, $newquestionparams,

2
mod/quiz/locallib.php
View File

@ -844,7 +844,7 @@ function quiz_question_edit_button($cmid, $question, $returnurl, $contentafteric
// Build the icon.
if ($action) {
if ($returnurl instanceof moodle_url) {
$returnurl = str_replace($CFG->wwwroot, '', $returnurl->out(false));
$returnurl = $returnurl->out_as_local_url(false);
}
$questionparams = array('returnurl' => $returnurl, 'cmid' => $cmid, 'id' => $question->id);
$questionurl = new moodle_url("$CFG->wwwroot/question/question.php", $questionparams);

2
question/editlib.php
View File

@ -871,7 +871,7 @@ class question_bank_view {
}
// Create the url of the new question page to forward to.
$returnurl = str_replace($CFG->wwwroot, '', $pageurl->out(false));
$returnurl = $pageurl->out_as_local_url(false);
$this->editquestionurl = new moodle_url('/question/question.php',
array('returnurl' => $returnurl));
if ($cm !== null){

3
question/engine/renderer.php
View File

@ -278,8 +278,7 @@ class core_question_renderer extends plugin_renderer_base {
$params = $options->editquestionparams;
if ($params['returnurl'] instanceof moodle_url) {
$params['returnurl'] = str_replace($CFG->wwwroot, '',
$params['returnurl']->out(false));
$params['returnurl'] = $params['returnurl']->out_as_local_url(false);
}
$params['id'] = $qa->get_question()->id;
$editurl = new moodle_url('/question/question.php', $params);