L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed MDL-10855 'Calculated question error: undefined stdClass::$nextpageparam' and some other calculated question bugs.

Browse Source
This commit is contained in:
jamiesensei
2007-08-17 01:06:02 +00:00
parent 778918fd71
commit 79bb720200
4 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/question.php
+14 -11
View File
@@ -25,6 +25,8 @@ $movecontext = optional_param('movecontext', 0, PARAM_BOOL);//switch to make qu
//uneditable - form is displayed to edit category only
$returnurl = optional_param('returnurl', 0, PARAM_LOCALURL);
$inpopup = optional_param('inpopup', 0, PARAM_BOOL);
if ($movecontext && !$id){
print_error('questiondoesnotexist', 'question', $returnurl);
}
@@ -174,26 +176,27 @@ if ($mform->is_cancelled()){
}
$question = $QTYPES[$question->qtype]->save_question($question, $fromform, $COURSE, $wizardnow);
if ($QTYPES[$qtype]->finished_edit_wizard($fromform) || $movecontext){
if (optional_param('inpopup', 0, PARAM_BOOL)) {
if (($QTYPES[$question->qtype]->finished_edit_wizard($fromform)) || $movecontext){
if ($inpopup) {
notify(get_string('changessaved'), '');
close_window(3);
} else {
redirect($returnurl);
}
} else {
$nexturlparams = array('returnurl'=>$returnurl)
+ $fromform->nextpageparam;//useful for passing data to the next page which is not saved in the database
if ($question->id) {
$nexturlparams['id'] = $question->id;
} else { // only for creating new questions
$nexturlparams['category'] = $question->category;
$nexturlparams['qtype'] =$question->qtype;
$nexturlparams = array('returnurl'=>$returnurl);
if (isset($fromform->nextpageparam) && is_array($fromform->nextpageparam)){
$nexturlparams += $fromform->nextpageparam;//useful for passing data to the next page which is not saved in the database
}
$nexturlparams['id'] = $question->id;
$nexturlparams['wizardnow'] = $fromform->wizard;
$nexturl = new moodle_url('question.php', $nexturlparams);
redirect($nexturl);
if ($cmid){
$nexturl->param('cmid', $cmid);
} else {
$nexturl->param('courseid', $COURSE->id);
}
redirect($nexturl->out());
}
} else {