From 99d671ebd3ed1d19051bec3ffdb15b78a8db00ea Mon Sep 17 00:00:00 2001
From: Pierre Pichet <pichet.pierre@uqam.ca>
Date: Fri, 17 Sep 2010 16:33:23 +0000
Subject: [PATCH] MDL-24249 adding an else if ($originalreturnurl && $wizardnow
 !== '')  for multipage question edition

---
 question/question.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/question/question.php b/question/question.php
index e96da88b894..caac68a7253 100644
--- a/question/question.php
+++ b/question/question.php
@@ -59,9 +59,11 @@ if ($inpopup !== 0) {
 }
 $PAGE->set_url($url);
 
-if ($originalreturnurl) {
+if ($originalreturnurl && $wizardnow == '') {
     $returnurl = $CFG->wwwroot . '/' . $originalreturnurl;
-} else {
+} else if ($originalreturnurl && $wizardnow !== ''){
+    $returnurl = $originalreturnurl;
+}else {
     $returnurl = "{$CFG->wwwroot}/question/edit.php?courseid={$COURSE->id}";
 }