From e42f153c335106a547d581493a9cb459d1622ccd Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Fri, 31 Jul 2009 09:30:11 +0000 Subject: [PATCH] MDL-19976 Changing redirect($url->out()) to redirect($url). NEVER, NEVER use redirect($url->out())!!! Bad Tim! :p --- lib/listlib.php | 2 +- mod/quiz/edit.php | 24 ++++++++++++------------ mod/quiz/report/overview/report.php | 2 +- mod/quiz/report/statistics/report.php | 2 +- question/category.php | 10 +++++----- question/category_class.php | 4 ++-- question/preview.php | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/listlib.php b/lib/listlib.php index eb43e271d4..bf2558a6bb 100644 --- a/lib/listlib.php +++ b/lib/listlib.php @@ -443,7 +443,7 @@ class moodle_list { return false; } - redirect($this->pageurl->out()); + redirect($this->pageurl); } /** diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index 0d81602eae..f10e25df07 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -190,13 +190,13 @@ foreach ($params as $key => $value) { if (($up = optional_param('up', false, PARAM_INT)) && confirm_sesskey()) { $quiz->questions = quiz_move_question_up($quiz->questions, $up); quiz_save_new_layout($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (($down = optional_param('down', false, PARAM_INT)) && confirm_sesskey()) { $quiz->questions = quiz_move_question_down($quiz->questions, $down); quiz_save_new_layout($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (optional_param('repaginate', false, PARAM_BOOL) && confirm_sesskey()) { @@ -212,7 +212,7 @@ if (($addquestion = optional_param('addquestion', 0, PARAM_INT)) && confirm_sess quiz_add_quiz_question($addquestion, $quiz, $addonpage); quiz_update_sumgrades($quiz); quiz_delete_previews($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) { @@ -226,7 +226,7 @@ if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) { } quiz_update_sumgrades($quiz); quiz_delete_previews($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } $qcobject = new question_category_object($pagevars['cpage'], $thispageurl, @@ -307,7 +307,7 @@ if ((optional_param('addrandom', false, PARAM_BOOL) || $newrandomcategory) && co quiz_update_sumgrades($quiz); quiz_delete_previews($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (optional_param('addnewpagesafterselected', null) && !empty($selectedquestionids) && confirm_sesskey()) { @@ -315,21 +315,21 @@ if (optional_param('addnewpagesafterselected', null) && !empty($selectedquestion $quiz->questions = quiz_add_page_break_after($quiz->questions, $questionid); } quiz_save_new_layout($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } $addpage = optional_param('addpage', false, PARAM_INT); if ($addpage !== false && confirm_sesskey()) { $quiz->questions = quiz_add_page_break_at($quiz->questions, $addpage); quiz_save_new_layout($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } $deleteemptypage = optional_param('deleteemptypage', false, PARAM_INT); if (($deleteemptypage !== false) && confirm_sesskey()) { $quiz->questions = quiz_delete_empty_page($quiz->questions, $deleteemptypage); quiz_save_new_layout($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } $remove = optional_param('remove', false, PARAM_INT); @@ -337,7 +337,7 @@ if (($remove = optional_param('remove', false, PARAM_INT)) && confirm_sesskey()) quiz_remove_question($quiz, $remove); quiz_update_sumgrades($quiz); quiz_delete_previews($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (optional_param('quizdeleteselected', false, PARAM_BOOL) && !empty($selectedquestionids) && confirm_sesskey()) { @@ -346,7 +346,7 @@ if (optional_param('quizdeleteselected', false, PARAM_BOOL) && !empty($selectedq } quiz_update_sumgrades($quiz); quiz_delete_previews($quiz); - redirect($thispageurl->out()); + redirect($thispageurl); } if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) { @@ -426,7 +426,7 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) { quiz_set_grade($maxgrade, $quiz); } - redirect($thispageurl->out()); + redirect($thispageurl); } $questionbank->process_actions($thispageurl, $cm); @@ -593,4 +593,4 @@ $qcobject->display_randomquestion_user_interface(); \ No newline at end of file +?> diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index 810aba5bf8..f5dfe2f294 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -171,7 +171,7 @@ class quiz_overview_report extends quiz_default_report { $this->regrade_all_needed($quiz, $groupstudents); } if ($regradeall || $regradealldry || $regradealldrydo){ - redirect($reporturl->out(false, $displayoptions), '', 5); + redirect($reporturl->out(false, $displayoptions, false), '', 5); } if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php index 6089ac44fb..1ded44d63f 100644 --- a/mod/quiz/report/statistics/report.php +++ b/mod/quiz/report/statistics/report.php @@ -86,7 +86,7 @@ class quiz_statistics_report extends quiz_default_report { print_error('errordeleting', 'quiz_statistics', '', 'quiz_question_response_stats'); } } - redirect($reporturl->out()); + redirect($reporturl); } diff --git a/question/category.php b/question/category.php index 29c032707c..e999edd9d6 100644 --- a/question/category.php +++ b/question/category.php @@ -54,30 +54,30 @@ $qcobject->moveform = new question_move_form($thispageurl, array('contexts'=>array($categorycontext), 'currentcat'=>$param->delete)); if ($qcobject->moveform->is_cancelled()){ - redirect($thispageurl->out()); + redirect($thispageurl); } elseif ($formdata = $qcobject->moveform->get_data()) { /// 'confirm' is the category to move existing questions to list($tocategoryid, $tocontextid) = explode(',', $formdata->category); $qcobject->move_questions_and_delete_category($formdata->delete, $tocategoryid); $thispageurl->remove_params('cat', 'category'); - redirect($thispageurl->out()); + redirect($thispageurl); } } else { $questionstomove = 0; } if ($qcobject->catform->is_cancelled()) { - redirect($thispageurl->out()); + redirect($thispageurl); } else if ($catformdata = $qcobject->catform->get_data()) { if (!$catformdata->id) {//new category $qcobject->add_category($catformdata->parent, $catformdata->name, $catformdata->info); } else { $qcobject->update_category($catformdata->id, $catformdata->parent, $catformdata->name, $catformdata->info); } - redirect($thispageurl->out()); + redirect($thispageurl); } else if ((!empty($param->delete) and (!$questionstomove) and confirm_sesskey())) { $qcobject->delete_category($param->delete);//delete the category now no questions to move $thispageurl->remove_params('cat', 'category'); - redirect($thispageurl->out()); + redirect($thispageurl); } $navlinks = array(); if ($cm!==null) { diff --git a/question/category_class.php b/question/category_class.php index 9cb1e6c01c..adbb92ad17 100644 --- a/question/category_class.php +++ b/question/category_class.php @@ -413,7 +413,7 @@ class question_category_object { if ($return) { return $categoryid; } else { - redirect($this->pageurl->out());//always redirect after successful action + redirect($this->pageurl);//always redirect after successful action } } @@ -469,7 +469,7 @@ class question_category_object { // Then redirect to an appropriate place. if ($oldcat->contextid == $tocontextid) { // not moving contexts - redirect($this->pageurl->out()); + redirect($this->pageurl); } else { redirect($CFG->wwwroot.'/question/contextmove.php?' . $this->pageurl->get_query_string(array( diff --git a/question/preview.php b/question/preview.php index 08005f4fc7..793c256342 100644 --- a/question/preview.php +++ b/question/preview.php @@ -56,7 +56,7 @@ unset($SESSION->quizpreview); // Redirect to ourselves but with continue=1; prevents refreshing the page // from restarting an attempt (needed so that random questions don't change) - redirect($url->out()); + redirect($url); } // Load the question information if (!$questions = $DB->get_records('question', array('id' => $id))) { -- 2.39.5